]> git.parisson.com Git - teleforma.git/commitdiff
Merge branch 'release/0.5' 0.5
authoryomguy <yomguy@parisson.com>
Mon, 11 Jun 2012 09:09:46 +0000 (11:09 +0200)
committeryomguy <yomguy@parisson.com>
Mon, 11 Jun 2012 09:09:46 +0000 (11:09 +0200)

Trivial merge