]> git.parisson.com Git - teleforma.git/commitdiff
Merge branch 'prodev' into pro
authorGuillaume Pellerin <yomguy@parisson.com>
Wed, 11 Jun 2014 12:20:18 +0000 (14:20 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Wed, 11 Jun 2014 12:20:18 +0000 (14:20 +0200)

Trivial merge