From: Ismaël Bouya Date: Thu, 30 Jul 2015 10:11:39 +0000 (+0200) Subject: Merge branch 'master' into android X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FConfig%2Ftinc%2Fhosts.git;a=commitdiff_plain;h=fdc0fb6bc6f5ec496f0c04dca4f1439bd407aa29 Merge branch 'master' into android --- fdc0fb6bc6f5ec496f0c04dca4f1439bd407aa29