]> git.parisson.com Git - teleforma.git/commitdiff
Merge branch 'prodev' of /var/git/teleforma into prodev
authorGuillaume Pellerin <yomguy@parisson.com>
Tue, 23 Apr 2013 13:51:00 +0000 (15:51 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Tue, 23 Apr 2013 13:51:00 +0000 (15:51 +0200)

Trivial merge