From: David Doukhan <david.doukhan@gmail.com>
Date: Fri, 24 Jan 2014 17:41:27 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/dev' into dev
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=7f89b9c7e06023c595432010c65d2a2607432157;p=timeside-diadems.git

Merge remote-tracking branch 'upstream/dev' into dev
---

7f89b9c7e06023c595432010c65d2a2607432157