From: Ismaël Bouya Date: Thu, 29 Sep 2016 14:51:33 +0000 (+0200) Subject: Merge branch 'master' into android X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=b1b2143035b73cd85a0de2acd2a79d5016f1a85e;p=perso%2FImmae%2FConfig%2Ftinc%2Fhosts.git Merge branch 'master' into android --- b1b2143035b73cd85a0de2acd2a79d5016f1a85e