From: Thomas Fillon <thomas@parisson.com>
Date: Fri, 7 Feb 2014 16:15:18 +0000 (+0100)
Subject: Merge branch 'dev' into diadems
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=42c2d2cbc8e7a2794644b2875db549b51096b25b;p=timeside.git

Merge branch 'dev' into diadems
---

42c2d2cbc8e7a2794644b2875db549b51096b25b