]> git.parisson.com Git - teleforma.git/commitdiff
Merge branch 'dev'
authoryomguy <yomguy@parisson.com>
Sun, 5 Aug 2012 16:06:24 +0000 (18:06 +0200)
committeryomguy <yomguy@parisson.com>
Sun, 5 Aug 2012 16:06:24 +0000 (18:06 +0200)

Trivial merge