]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev' into diadems
authorGuillaume Pellerin <yomguy@parisson.com>
Wed, 28 May 2014 13:24:02 +0000 (15:24 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Wed, 28 May 2014 13:24:02 +0000 (15:24 +0200)
commit5663048e4f8ef568585f65e15ee464309c0a17c3
tree51cfc4900af8cc65436f81b21cfb4b41913a653d
parent535a00318fd529a733acb4b3129353024dbdf727
parent262a4817d1f09961f86a82370472f525eb4dcad1
Merge branch 'dev' into diadems