From: zer0 <zer0@platinum>
Date: Mon, 25 Jan 2010 21:13:00 +0000 (+0100)
Subject: merge
X-Git-Url: http://git.droids-corp.org/?p=aversive.git;a=commitdiff_plain;h=0e9f190378d69540389fad5e231529ba153761b2

merge
---

0e9f190378d69540389fad5e231529ba153761b2