]> git.parisson.com Git - teleforma.git/commitdiff
Merge branch 'dev'
authoryomguy <yomguy@parisson.com>
Tue, 10 Jul 2012 14:11:56 +0000 (16:11 +0200)
committeryomguy <yomguy@parisson.com>
Tue, 10 Jul 2012 14:11:56 +0000 (16:11 +0200)

Trivial merge