]> git.parisson.com Git - teleforma.git/commitdiff
Merge branch 'pro' of /var/git/teleforma into pro
authorGuillaume Pellerin <yomguy@parisson.com>
Tue, 19 Mar 2013 21:20:57 +0000 (22:20 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Tue, 19 Mar 2013 21:20:57 +0000 (22:20 +0100)

Trivial merge