]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev' into diadems
authorGuillaume Pellerin <yomguy@parisson.com>
Tue, 27 May 2014 10:19:49 +0000 (12:19 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Tue, 27 May 2014 10:19:49 +0000 (12:19 +0200)
commit535a00318fd529a733acb4b3129353024dbdf727
tree00697ccfd8057cd8c21355ce64d848e84959654e
parent0b8bd4656231307e3da16a10094458345660c9c2
parent8f1a69ab7d6dc770e93e0905071e7ac800e4448b
Merge branch 'dev' into diadems