]> git.parisson.com Git - teleforma.git/commitdiff
Merge branch 'crfpa' into ae
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 9 Sep 2013 11:14:38 +0000 (13:14 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 9 Sep 2013 11:14:38 +0000 (13:14 +0200)

Trivial merge