]> git.parisson.com Git - teleforma.git/commitdiff
Merge branch 'release/0.6' 0.6
authoryomguy <yomguy@parisson.com>
Mon, 9 Jul 2012 10:41:55 +0000 (12:41 +0200)
committeryomguy <yomguy@parisson.com>
Mon, 9 Jul 2012 10:41:55 +0000 (12:41 +0200)

Trivial merge