]> git.parisson.com Git - teleforma.git/commitdiff
Merge branch 'pro' of /var/git/teleforma into pro
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 6 Jun 2013 08:43:47 +0000 (10:43 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 6 Jun 2013 08:43:47 +0000 (10:43 +0200)

Trivial merge