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

author Thomas Fillon <thomas@parisson.com>

Thu, 11 Sep 2014 23:33:11 +0000 (01:33 +0200)

committer Thomas Fillon <thomas@parisson.com>

Thu, 11 Sep 2014 23:33:11 +0000 (01:33 +0200)
author Thomas Fillon <thomas@parisson.com>
Thu, 11 Sep 2014 23:33:11 +0000 (01:33 +0200)
committer Thomas Fillon <thomas@parisson.com>
Thu, 11 Sep 2014 23:33:11 +0000 (01:33 +0200)
diff --cc Conferences/2014_DLFM/slides/slides_DLFM2014.tex
Simple merge
author	Thomas Fillon <thomas@parisson.com>
	Thu, 11 Sep 2014 23:33:11 +0000 (01:33 +0200)
committer	Thomas Fillon <thomas@parisson.com>
	Thu, 11 Sep 2014 23:33:11 +0000 (01:33 +0200)