From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 7 Jul 2014 22:31:05 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=bcd84ec98f4a5d8a3b12e3ee5eb2c2b07486eb1a;p=telemeta-doc.git

Merge branch 'dev'

Conflicts:
	Conferences/2014_EcoAc/Telemeta_EcoAcoustics_2014_06.pdf
---

bcd84ec98f4a5d8a3b12e3ee5eb2c2b07486eb1a
diff --cc Conferences/2014_EcoAc/Telemeta_EcoAcoustics_2014_06.pdf
index b3768a6,c477fa4..98f9efe
Binary files differ