]> gitweb.pimeys.fr Git - config-20-100.git/commitdiff
Merge branch 'master' into perso
authorVincent Le Gallic <legallic@crans.org>
Sat, 27 Jul 2013 23:22:13 +0000 (01:22 +0200)
committerVincent Le Gallic <legallic@crans.org>
Sat, 27 Jul 2013 23:22:13 +0000 (01:22 +0200)

Trivial merge