]> gitweb.pimeys.fr Git - config-20-100.git/commitdiff
Merge branch 'master' into perso
authorVincent Le Gallic <legallic@crans.org>
Thu, 3 Oct 2013 16:56:46 +0000 (18:56 +0200)
committerVincent Le Gallic <legallic@crans.org>
Thu, 3 Oct 2013 16:56:46 +0000 (18:56 +0200)

Trivial merge