From: WANG <wang@wang-OptiPlex-780.(none)>
Date: Mon, 16 Sep 2013 15:56:12 +0000 (+0200)
Subject: Merge branch 'master' of https://scm.cri.ensmp.fr/git/Faustine
X-Git-Url: https://scm.cri.mines-paristech.fr/git/Faustine.git/commitdiff_plain/1059e1cc0c2ecfa237406949aa26155b6a5b9154?hp=1059e1cc0c2ecfa237406949aa26155b6a5b9154

Merge branch 'master' of https://scm.cri.ensmp.fr/git/Faustine

Conflicts:
	examples/Makefile
---