]> gitweb.pimeys.fr Git - config-20-100.git/commitdiff
Merge branch 'master' into perso
authorVincent Le Gallic <legallic@crans.org>
Thu, 24 Dec 2015 23:40:20 +0000 (00:40 +0100)
committerVincent Le Gallic <legallic@crans.org>
Thu, 24 Dec 2015 23:40:20 +0000 (00:40 +0100)

Trivial merge