]> git.parisson.com Git - teleforma.git/commitdiff
Merge branch 'prodev' of /var/git/teleforma into prodev
authorGuillaume Pellerin <yomguy@parisson.com>
Wed, 12 Jun 2013 17:19:14 +0000 (19:19 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Wed, 12 Jun 2013 17:19:14 +0000 (19:19 +0200)

Trivial merge