]> git.parisson.com Git - teleforma.git/commitdiff
Merge branch 'pro' of git+ssh://vcs.parisson.com/var/git/teleforma into pro
authorYoan Le Clanche <yoan@probarreau.pilotsystems.net>
Mon, 18 Feb 2013 11:03:07 +0000 (12:03 +0100)
committerYoan Le Clanche <yoan@probarreau.pilotsystems.net>
Mon, 18 Feb 2013 11:03:07 +0000 (12:03 +0100)

Trivial merge