From: Ismaël Bouya <ismael.bouya@normalesup.org>
Date: Wed, 25 Nov 2015 13:31:13 +0000 (+0100)
Subject: Merge branch 'master' into android
X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FConfig%2Ftinc%2Fhosts.git;a=commitdiff_plain;h=cdc11ad81e3ff61b9d407760014150623a42a6f6

Merge branch 'master' into android
---

cdc11ad81e3ff61b9d407760014150623a42a6f6