From: Thomas Fillon <thomas@parisson.com>
Date: Thu, 19 Jun 2014 16:40:39 +0000 (+0200)
Subject: merge dev from github
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=4cb6a74f6e9dc14c54080121b708d9a734b31f7c;p=telemeta-doc.git

merge dev from github
---

4cb6a74f6e9dc14c54080121b708d9a734b31f7c
diff --cc Conferences/2014_DLFM/dlfm2014_Telemeta.pdf
index 6bf0a58,0000000..e84bf0b
mode 100644,000000..100644
Binary files differ