]> git.parisson.com Git - teleforma.git/commitdiff
Merge branch 'pro' of /var/git/teleforma into pro
authorGuillaume Pellerin <yomguy@parisson.com>
Wed, 20 Mar 2013 10:39:27 +0000 (11:39 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Wed, 20 Mar 2013 10:39:27 +0000 (11:39 +0100)

Trivial merge