From: Vincent Le Gallic <legallic@crans.org>
Date: Thu, 24 May 2012 22:41:01 +0000 (+0200)
Subject: Merge branch 'master', remote-tracking branch 'origin'
X-Git-Url: http://gitweb.pimeys.fr/?a=commitdiff_plain;h=f08268160a8984a28ef25aae92d8d7adbbedeaad;p=bots%2Fbasile.git

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

f08268160a8984a28ef25aae92d8d7adbbedeaad