From: Karim Barkati 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=sidebyside;hp=--cc Merge branch 'master' of https://scm.cri.ensmp.fr/git/Faustine Conflicts: INSTALL.txt --- 509aeb980ddb8825bfbbb59f060bbca48918fac8