]> git.parisson.com Git - teleforma.git/commitdiff
Merge branch 'release/0.4' into dev
authoryomguy <yomguy@parisson.com>
Tue, 5 Jun 2012 01:08:44 +0000 (03:08 +0200)
committeryomguy <yomguy@parisson.com>
Tue, 5 Jun 2012 01:08:44 +0000 (03:08 +0200)

Trivial merge