]> git.parisson.com Git - teleforma.git/commitdiff
Merge branch 'dev' of /var/git/teleforma into ae
authorGuillaume Pellerin <yomguy@parisson.com>
Wed, 7 Nov 2012 10:49:09 +0000 (11:49 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Wed, 7 Nov 2012 10:49:09 +0000 (11:49 +0100)

Trivial merge