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-Tag: 0.5.4~3^2^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=e09091e56e9f03b3c7bc97ee5a38f9f5f6dba63d;p=timeside.git

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

e09091e56e9f03b3c7bc97ee5a38f9f5f6dba63d