From: Ismaël Bouya <ismael.bouya@normalesup.org>
Date: Sun, 29 May 2016 21:29:39 +0000 (+0200)
Subject: Merge branch 'master' into android
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=79f6022bf202371af204470605cfda10ba60d039;hp=-c;p=perso%2FImmae%2FConfig%2Ftinc%2Fhosts.git

Merge branch 'master' into android
---

79f6022bf202371af204470605cfda10ba60d039