From: Ismaël Bouya <ismael.bouya@normalesup.org>
Date: Thu, 18 Jun 2015 08:13:23 +0000 (+0200)
Subject: Merge branch 'master' into android
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=a9f19366acb347b6346ef205628c179bc89034f2;hp=-c;p=perso%2FImmae%2FConfig%2Ftinc%2Fhosts.git

Merge branch 'master' into android
---

a9f19366acb347b6346ef205628c179bc89034f2