]> git.parisson.com Git - timeside.git/commitdiff
Merge branch 'release/0.4.0' into dev
authoryomguy <yomguy@parisson.com>
Fri, 28 Sep 2012 22:02:11 +0000 (00:02 +0200)
committeryomguy <yomguy@parisson.com>
Fri, 28 Sep 2012 22:02:11 +0000 (00:02 +0200)

Trivial merge