]> git.parisson.com Git - teleforma.git/commitdiff
Merge branch 'pro' of /var/git/teleforma into pro
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 8 Feb 2013 14:47:38 +0000 (15:47 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 8 Feb 2013 14:47:38 +0000 (15:47 +0100)

Trivial merge