]> git.parisson.com Git - teleforma.git/commitdiff
Merge branch 'master' of /var/git/teleforma
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 20 Jul 2012 18:22:53 +0000 (20:22 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 20 Jul 2012 18:22:53 +0000 (20:22 +0200)

Trivial merge