]> git.parisson.com Git - teleforma.git/commitdiff
Merge branch 'pro' of /var/git/teleforma into prodev
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 30 May 2013 14:14:05 +0000 (16:14 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 30 May 2013 14:14:05 +0000 (16:14 +0200)

Trivial merge