]> git.parisson.com Git - telemeta-doc.git/commit
Merge branch 'master' of git+ssh://vcs.parisson.com/var/git/telemeta-doc
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 24 Jun 2013 14:02:13 +0000 (16:02 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 24 Jun 2013 14:02:13 +0000 (16:02 +0200)
commitf0ec7ed3cfe16be7b99057783064d741e387fafd
treebdd2019de02882688a6c4ea236a750e19bd9ef76
parent3bc36a3617f4c46635ef87853af25c5b06cd1e9d
parent6ea2c4db87dd22b7e94d397d936d2ddbf5a4819f
Merge branch 'master' of git+ssh://vcs.parisson.com/var/git/telemeta-doc

Conflicts:
CMMR_2013/cmmr_2013_Telemeta.pdf