From: Ismaël Bouya Date: Sat, 28 Nov 2015 10:04:49 +0000 (+0100) Subject: Merge branch 'master' into android X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=7f93c08583094c3311c662ba5cc69e1c04ac1813;p=perso%2FImmae%2FConfig%2Ftinc%2Fhosts.git Merge branch 'master' into android --- 7f93c08583094c3311c662ba5cc69e1c04ac1813