]> git.parisson.com Git - telemeta.git/commit
Merge branch 'master' into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 15 Dec 2014 16:36:05 +0000 (17:36 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 15 Dec 2014 16:36:05 +0000 (17:36 +0100)
commit9f6d02697d225c92e2e82b583f147e26a4fdc0a4
treeb4815575bd11385cd2a2e5873adfb4d6d928a55c
parent51e7a241a5422bdbecc23a5adb8f76304c67f241
parent90e57095618b359dce0f23d6238bb8824b122586
Merge branch 'master' into dev