From: Guillaume Pellerin Date: Tue, 12 Nov 2013 13:34:27 +0000 (+0100) Subject: Merge branch 'master' into dev X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=773b6c31e7f250e8a4f524ddf8d468e41025c821;p=timeside-diadems.git Merge branch 'master' into dev --- 773b6c31e7f250e8a4f524ddf8d468e41025c821