]> git.immae.eu Git - perso/Immae/Config/tinc/hosts.git/commitdiff
Merge branch 'master' into android
authorIsmaël Bouya <ismael.bouya@normalesup.org>
Sun, 29 May 2016 21:29:39 +0000 (23:29 +0200)
committerIsmaël Bouya <ismael.bouya@normalesup.org>
Sun, 29 May 2016 21:29:39 +0000 (23:29 +0200)

Trivial merge