]> git.parisson.com Git - teleforma.git/commitdiff
Merge branch 'crfpa' into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Tue, 2 Sep 2014 12:20:50 +0000 (14:20 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Tue, 2 Sep 2014 12:20:50 +0000 (14:20 +0200)

Trivial merge