Merge branch 'dev' of github.com:Parisson/Telemeta-doc into dev

author Guillaume Pellerin <yomguy@parisson.com>

Fri, 12 Sep 2014 07:24:40 +0000 (09:24 +0200)

committer Guillaume Pellerin <yomguy@parisson.com>

Fri, 12 Sep 2014 07:24:40 +0000 (09:24 +0200)
author Guillaume Pellerin <yomguy@parisson.com>
Fri, 12 Sep 2014 07:24:40 +0000 (09:24 +0200)
committer Guillaume Pellerin <yomguy@parisson.com>
Fri, 12 Sep 2014 07:24:40 +0000 (09:24 +0200)
diff --cc Conferences/2014_DLFM/slides/slides_DLFM2014.tex
Simple merge
author	Guillaume Pellerin <yomguy@parisson.com>
	Fri, 12 Sep 2014 07:24:40 +0000 (09:24 +0200)
committer	Guillaume Pellerin <yomguy@parisson.com>
	Fri, 12 Sep 2014 07:24:40 +0000 (09:24 +0200)