]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev'
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 15 Dec 2014 16:21:15 +0000 (17:21 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 15 Dec 2014 16:21:15 +0000 (17:21 +0100)
commit90e57095618b359dce0f23d6238bb8824b122586
tree2ad9b5d2bb18262a670d64c701a138c21d26b148
parent17c919aaf2ce2eeb64414e84b41635c16584119e
parent3cc3f4aa47b6c252697380e5f4c88a4755980c3f
Merge branch 'dev'