From: Guillaume Pellerin Date: Sun, 20 Oct 2013 16:34:49 +0000 (+0200) Subject: Merge branch 'master' into dev X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=f3dccc50e09884d6ad19ed58d098ba51835a6a1e;p=timeside-diadems.git Merge branch 'master' into dev --- f3dccc50e09884d6ad19ed58d098ba51835a6a1e