]> gitweb.pimeys.fr Git - bots/basile.git/commitdiff
Merge branch 'master' of /git/basile
authorVincent Le Gallic <basile@crans.org>
Wed, 13 Nov 2013 22:45:10 +0000 (23:45 +0100)
committerVincent Le Gallic <basile@crans.org>
Wed, 13 Nov 2013 22:45:10 +0000 (23:45 +0100)
1  2 
basile.py

diff --cc basile.py
Simple merge