]> git.parisson.com Git - teleforma.git/commitdiff
Merge branch 'dev' of git+ssh://vcs.parisson.com/var/git/teleforma into dev
authoryomguy <yomguy@parisson.com>
Tue, 31 Jul 2012 21:34:41 +0000 (23:34 +0200)
committeryomguy <yomguy@parisson.com>
Tue, 31 Jul 2012 21:34:41 +0000 (23:34 +0200)

Trivial merge