]> git.immae.eu Git - perso/Immae/Config/tinc/hosts.git/commitdiff
Merge branch 'master' into android
authorIsmaël Bouya <ismael.bouya@normalesup.org>
Wed, 25 Nov 2015 13:31:13 +0000 (14:31 +0100)
committerIsmaël Bouya <ismael.bouya@normalesup.org>
Wed, 25 Nov 2015 13:31:13 +0000 (14:31 +0100)

Trivial merge