From: Ismaël Bouya <ismael.bouya@normalesup.org>
Date: Fri, 24 Nov 2017 09:39:48 +0000 (+0100)
Subject: Merge branch 'master' into android
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=9e9f8220b6874a176d2c9e28cbb6c6d095a12c9c;hp=71375c1086d5a79eadfb0ca0f7642c719e41c928;p=perso%2FImmae%2FConfig%2Ftinc%2Fhosts.git

Merge branch 'master' into android
---