]> git.parisson.com Git - teleforma.git/commitdiff
Merge branch 'crfpa' of git+ssh://vcs.parisson.com/var/git/teleforma into crfpa
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 18 Jul 2014 14:30:05 +0000 (16:30 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 18 Jul 2014 14:30:05 +0000 (16:30 +0200)

Trivial merge