]> git.parisson.com Git - teleforma.git/commitdiff
Merge branch 'release/0.5.4' 0.5.4
authoryomguy <yomguy@parisson.com>
Tue, 19 Jun 2012 18:14:54 +0000 (20:14 +0200)
committeryomguy <yomguy@parisson.com>
Tue, 19 Jun 2012 18:14:54 +0000 (20:14 +0200)

Trivial merge