]> git.parisson.com Git - teleforma.git/commitdiff
Merge branch 'prodev' of /var/git/teleforma into prodev
authorGuillaume Pellerin <yomguy@parisson.com>
Tue, 15 Jan 2013 09:56:38 +0000 (10:56 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Tue, 15 Jan 2013 09:56:38 +0000 (10:56 +0100)

Trivial merge