]> git.parisson.com Git - teleforma.git/commitdiff
Merge branch 'crfpa' into icp
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 12 Sep 2013 07:15:03 +0000 (09:15 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 12 Sep 2013 07:15:03 +0000 (09:15 +0200)

Trivial merge