]> git.parisson.com Git - teleforma.git/commitdiff
Merge branch 'prodev' into pro
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 5 May 2014 08:04:39 +0000 (10:04 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 5 May 2014 08:04:39 +0000 (10:04 +0200)

Trivial merge