]> git.parisson.com Git - teleforma.git/commitdiff
Merge branch 'prodev' into pro
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 11 Jul 2014 09:41:44 +0000 (11:41 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 11 Jul 2014 09:41:44 +0000 (11:41 +0200)

Trivial merge