merge dev from github

author Thomas Fillon <thomas@parisson.com>

Thu, 19 Jun 2014 16:40:39 +0000 (18:40 +0200)

committer Thomas Fillon <thomas@parisson.com>

Thu, 19 Jun 2014 16:40:39 +0000 (18:40 +0200)
author Thomas Fillon <thomas@parisson.com>
Thu, 19 Jun 2014 16:40:39 +0000 (18:40 +0200)
committer Thomas Fillon <thomas@parisson.com>
Thu, 19 Jun 2014 16:40:39 +0000 (18:40 +0200)
diff --cc Conferences/2014_DLFM/dlfm2014_Telemeta.pdf

index 6bf0a58fd3900d29eaa58028d9bae9481de7484d,0000000000000000000000000000000000000000..e84bf0bd3befc7742a9f502ba78f1795d7a3c49d

mode 100644,000000..100644

Binary files differ
author	Thomas Fillon <thomas@parisson.com>
	Thu, 19 Jun 2014 16:40:39 +0000 (18:40 +0200)
committer	Thomas Fillon <thomas@parisson.com>
	Thu, 19 Jun 2014 16:40:39 +0000 (18:40 +0200)