From: Paul Brossier <piem@piem.org>
Date: Wed, 29 Aug 2012 16:04:14 +0000 (-0600)
Subject: merge with origin
X-Git-Tag: 0.3.3^2~9^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=41dfd54fc934bacd47ad9422c8bbe2822befb962;p=timeside.git

merge with origin
---

41dfd54fc934bacd47ad9422c8bbe2822befb962