]> git.parisson.com Git - teleforma.git/commitdiff
Merge branch 'hotfix/0.7.1-dev' into dev
authoryomguy <yomguy@parisson.com>
Thu, 19 Jul 2012 20:15:13 +0000 (22:15 +0200)
committeryomguy <yomguy@parisson.com>
Thu, 19 Jul 2012 20:15:13 +0000 (22:15 +0200)

Trivial merge