From: Guillaume Pellerin <yomguy@parisson.com>
Date: Sun, 15 Jun 2014 23:46:31 +0000 (+0200)
Subject: Merge branch 'EcoAcoustic_TF' of github.com:Parisson/Telemeta-doc into HEAD
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=ac03c1329c2f5e21a3e0ab6cf9672d08cc22bd39;p=telemeta-doc.git

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

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

ac03c1329c2f5e21a3e0ab6cf9672d08cc22bd39
diff --cc Conferences/2014_EcoAc/Telemeta_EcoAcoustics_2014_06.pdf
index 0000000,c3a3d19..2cfb364
mode 000000,100644..100644
Binary files differ