]> gitweb.pimeys.fr Git - config-20-100.git/commitdiff
Merge branch 'master' into perso
authorVincent Le Gallic <legallic@crans.org>
Sun, 29 Sep 2013 12:26:27 +0000 (14:26 +0200)
committerVincent Le Gallic <legallic@crans.org>
Sun, 29 Sep 2013 12:26:27 +0000 (14:26 +0200)

Trivial merge