From: Ismaël Bouya Date: Wed, 17 Jun 2015 17:19:46 +0000 (+0200) Subject: Merge branch 'master' into android X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=39eb639ba1145cf61c557a7b6d3b9361261f93b7;p=perso%2FImmae%2FConfig%2Ftinc%2Fhosts.git Merge branch 'master' into android --- 39eb639ba1145cf61c557a7b6d3b9361261f93b7