]> git.parisson.com Git - teleforma.git/commitdiff
Merge branch 'release/0.5.2' 0.5.2
authoryomguy <yomguy@parisson.com>
Mon, 11 Jun 2012 14:40:02 +0000 (16:40 +0200)
committeryomguy <yomguy@parisson.com>
Mon, 11 Jun 2012 14:40:02 +0000 (16:40 +0200)

Trivial merge