]> git.immae.eu Git - perso/Immae/Config/tinc/hosts.git/commitdiff
Merge branch 'master' into android
authorIsmaël Bouya <ismael.bouya@normalesup.org>
Thu, 30 Jul 2015 10:11:39 +0000 (12:11 +0200)
committerIsmaël Bouya <ismael.bouya@normalesup.org>
Thu, 30 Jul 2015 10:11:39 +0000 (12:11 +0200)

Trivial merge