From: Guillaume Pellerin Date: Tue, 24 Jun 2014 23:21:15 +0000 (+0200) Subject: Merge branch 'master' into dev X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=d177c38653219c57db654beb3e4f1c97fec78fb8;p=timeside-diadems.git Merge branch 'master' into dev --- d177c38653219c57db654beb3e4f1c97fec78fb8