]> git.parisson.com Git - teleforma.git/commit
Merge branch 'pro' of /var/git/teleforma into prodev
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 30 May 2013 14:14:05 +0000 (16:14 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 30 May 2013 14:14:05 +0000 (16:14 +0200)
commit39ae8d496993e26ed4c89897a15adbb255b21e6d
tree3133be2d4a20faf07cedb63611e3412c76088423
parentc3f09ae7c86de7b69ebe35f77a6e080637a1e0b5
parente8fadf70c2083b9cdacb8e7c7b25e67de02842a7
Merge branch 'pro' of /var/git/teleforma into prodev