]> git.parisson.com Git - teleforma.git/commitdiff
Merge branch 'pro' of git+ssh://vcs.parisson.com/var/git/teleforma into pro
authoryomguy <yomguy@parisson.com>
Wed, 2 Jan 2013 16:16:59 +0000 (17:16 +0100)
committeryomguy <yomguy@parisson.com>
Wed, 2 Jan 2013 16:16:59 +0000 (17:16 +0100)

Trivial merge