]> git.parisson.com Git - telemeta.git/commit
Merge branch 'master' into develop
authoryomguy <yomguy@parisson.com>
Wed, 2 May 2012 14:33:40 +0000 (16:33 +0200)
committeryomguy <yomguy@parisson.com>
Wed, 2 May 2012 14:33:40 +0000 (16:33 +0200)
commit7d6cfb3ef964ce69fe80a44f542711bf390411e1
tree01e7a84dedb3f7337e3873297a9389dcd2ef1754
parentd24c827d706bd02f5a36eb41d90a82fb8c9e3d63
parent57305a5a89e7cfaa7296fef55c7ff13be26a879f
Merge branch 'master' into develop