]> gitweb.pimeys.fr Git - bots/basile.git/commitdiff
Merge branch 'master', remote-tracking branch 'origin'
authorVincent Le Gallic <legallic@crans.org>
Thu, 24 May 2012 22:41:01 +0000 (00:41 +0200)
committerVincent Le Gallic <legallic@crans.org>
Thu, 24 May 2012 22:41:01 +0000 (00:41 +0200)
1  2 
basile.py

diff --cc basile.py
Simple merge