]> git.parisson.com Git - teleforma.git/commitdiff
Merge branch 'pro' of git+ssh://vcs.parisson.com/var/git/teleforma into pro
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 11 Jul 2014 09:41:54 +0000 (11:41 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 11 Jul 2014 09:41:54 +0000 (11:41 +0200)

Trivial merge