]> git.parisson.com Git - telemeta.git/commit
Merge branch 'master' into dev
authoryomguy <yomguy@parisson.com>
Tue, 2 Oct 2012 21:10:29 +0000 (23:10 +0200)
committeryomguy <yomguy@parisson.com>
Tue, 2 Oct 2012 21:10:29 +0000 (23:10 +0200)
commitb1174f9f04e9d33e614390d90797351083670683
tree5242deaf0eb1cf3146bcd36f3f103cf07e8e94bc
parente46cfb98f89b96a9bc5f2c684342f925cc9a209f
parent8adad8ce892586f4cd9bb7c61089b022464acbb6
Merge branch 'master' into dev