]> git.parisson.com Git - teleforma.git/commitdiff
Merge branch 'hotfix/0.5.1' into dev
authoryomguy <yomguy@parisson.com>
Mon, 11 Jun 2012 09:28:18 +0000 (11:28 +0200)
committeryomguy <yomguy@parisson.com>
Mon, 11 Jun 2012 09:28:18 +0000 (11:28 +0200)

Trivial merge