]> gitweb.pimeys.fr Git - bots/saturnin.git/commitdiff
Merge branch 'master' of /git/saturnin
authorSaturnin, le bot IRC <saturnin@crans.org>
Sun, 29 Jul 2012 23:04:07 +0000 (01:04 +0200)
committerSaturnin, le bot IRC <saturnin@crans.org>
Sun, 29 Jul 2012 23:04:07 +0000 (01:04 +0200)
1  2 
config.py

diff --cc config.py
Simple merge