]> git.parisson.com Git - teleforma.git/commitdiff
Merge branch 'dev' of git+ssh://vcs.parisson.com/var/git/teleforma into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Sat, 28 Jul 2012 22:21:15 +0000 (00:21 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Sat, 28 Jul 2012 22:21:15 +0000 (00:21 +0200)

Trivial merge