]> gitweb.pimeys.fr Git - config-20-100.git/commitdiff
Merge branch 'master' into perso
authorVincent Le Gallic <legallic@crans.org>
Sun, 23 Mar 2014 19:22:27 +0000 (20:22 +0100)
committerVincent Le Gallic <legallic@crans.org>
Sun, 23 Mar 2014 19:22:27 +0000 (20:22 +0100)

Trivial merge