]> git.parisson.com Git - telemeta.git/commit
Merge branch 'master' into develop
authoryomguy <yomguy@parisson.com>
Fri, 4 May 2012 14:56:03 +0000 (16:56 +0200)
committeryomguy <yomguy@parisson.com>
Fri, 4 May 2012 14:56:03 +0000 (16:56 +0200)
commit733baa08e4682655d6fe6dba83e0436c01b829f4
tree55b576076bef284e253f97d58f278151fc2d859c
parent7d6cfb3ef964ce69fe80a44f542711bf390411e1
parent84ccc98f722195bfe53965d961e8d011122f9be0
Merge branch 'master' into develop