]> git.parisson.com Git - teleforma.git/commitdiff
Merge branch 'prodev' into pro
authorGuillaume Pellerin <yomguy@parisson.com>
Tue, 10 Jun 2014 11:52:56 +0000 (13:52 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Tue, 10 Jun 2014 11:52:56 +0000 (13:52 +0200)

Trivial merge