From: bassam al-kindy <bassam.al-kindy@lifc>
Date: Mon, 16 Dec 2013 13:30:44 +0000 (+0100)
Subject: Update the author section
X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/chloroplast13.git/commitdiff_plain/181fe86127b57e8c7df3e97082134e7a5b7b8618?ds=sidebyside;hp=181fe86127b57e8c7df3e97082134e7a5b7b8618

Update the author section
Merge branch 'master' of ssh://bilbo.iut-bm.univ-fcomte.fr/chloroplast13

Conflicts:
	annotated.tex
	main.tex
---