]> git.parisson.com Git - teleforma.git/commitdiff
Merge branch 'prodev' of /var/git/teleforma into prodev
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 6 Dec 2013 23:39:50 +0000 (00:39 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 6 Dec 2013 23:39:50 +0000 (00:39 +0100)

Trivial merge