]> git.parisson.com Git - teleforma.git/commitdiff
Merge branch 'dev'
authoryomguy <yomguy@parisson.com>
Wed, 20 Jun 2012 11:04:00 +0000 (13:04 +0200)
committeryomguy <yomguy@parisson.com>
Wed, 20 Jun 2012 11:04:00 +0000 (13:04 +0200)

Trivial merge