From: Olivier MATZ <zer0@droids-corp.org>
Date: Sun, 7 Mar 2010 19:57:58 +0000 (+0100)
Subject: merge
X-Git-Url: http://git.droids-corp.org/?p=aversive.git;a=commitdiff_plain;h=844fa3427676e08d7e9f92279788def635377714;hp=844fa3427676e08d7e9f92279788def635377714;ds=sidebyside

merge
---