]> 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>
Mon, 18 Feb 2013 12:12:24 +0000 (13:12 +0100)
committeryomguy <yomguy@parisson.com>
Mon, 18 Feb 2013 12:12:24 +0000 (13:12 +0100)

Trivial merge