From: Vincent Le Gallic <legallic@crans.org>
Date: Sun, 20 May 2012 20:48:40 +0000 (+0200)
Subject: Merge branch 'master', remote-tracking branch 'origin'
X-Git-Url: http://gitweb.pimeys.fr/?p=bots%2Fdeconnaisseur.git;a=commitdiff_plain;h=ae87878e14b5c65e2de06002269a12fe0b492b10

Merge branch 'master', remote-tracking branch 'origin'
---