From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 24 Jun 2013 14:02:13 +0000 (+0200)
Subject: Merge branch 'master' of git+ssh://vcs.parisson.com/var/git/telemeta-doc
X-Git-Tag: CMMR2013-slides~23
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=f0ec7ed3cfe16be7b99057783064d741e387fafd;p=telemeta-doc.git

Merge branch 'master' of git+ssh://vcs.parisson.com/var/git/telemeta-doc

Conflicts:
	CMMR_2013/cmmr_2013_Telemeta.pdf
---

f0ec7ed3cfe16be7b99057783064d741e387fafd