]> git.parisson.com Git - teleforma.git/commitdiff
Merge branch 'pro' of /var/git/teleforma into pro
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 26 Apr 2013 13:39:14 +0000 (15:39 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 26 Apr 2013 13:39:14 +0000 (15:39 +0200)

Trivial merge