]> git.parisson.com Git - telemeta-doc.git/commit
Merge branch 'dev'
authorGuillaume Pellerin <yomguy@parisson.com>
Tue, 8 Jul 2014 07:39:11 +0000 (09:39 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Tue, 8 Jul 2014 07:39:11 +0000 (09:39 +0200)
commitf471bf3229eb33434fcd5fe2638182da00a2434e
tree134d242347f4d89fabbfdf5c294b7db4336eca03
parentbcd84ec98f4a5d8a3b12e3ee5eb2c2b07486eb1a
parent249b221b2fec49013ac4abc2a81e86b18eda2e11
Merge branch 'dev'