]> git.parisson.com Git - telemeta-doc.git/commit
Merge branch 'dev'
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 12 Sep 2014 09:13:57 +0000 (11:13 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 12 Sep 2014 09:13:57 +0000 (11:13 +0200)
commit36703903dca738316317198288b79a9896568007
tree44c8486bb5f92c43154145d43b89bee717ed68f3
parentd78086be8fb43ddc87fa8ea4139d77c0a91d5a75
parent9184da04311524e0b33f871792db7aba4d92475e
Merge branch 'dev'