From: Karim Barkati <karimbarkati@gmail.com>
Date: Tue, 17 Sep 2013 14:40:41 +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/509aeb980ddb8825bfbbb59f060bbca48918fac8?ds=inline;hp=509aeb980ddb8825bfbbb59f060bbca48918fac8

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

Conflicts:
	INSTALL.txt
---