]> git.parisson.com Git - teleforma.git/commitdiff
Merge branch 'crfpa' of /var/git/teleforma into crfpa
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 12 Sep 2013 11:24:18 +0000 (13:24 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 12 Sep 2013 11:24:18 +0000 (13:24 +0200)

Trivial merge