]> git.parisson.com Git - teleforma.git/commitdiff
Merge branch 'dev' into crfpa
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 9 Feb 2015 09:14:52 +0000 (10:14 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 9 Feb 2015 09:14:52 +0000 (10:14 +0100)

Trivial merge