Merge branch 'master' of https://scm.cri.ensmp.fr/git/Faustine
authorKarim Barkati <karimbarkati@gmail.com>
Tue, 17 Sep 2013 14:40:41 +0000 (16:40 +0200)
committerKarim Barkati <karimbarkati@gmail.com>
Tue, 17 Sep 2013 14:40:41 +0000 (16:40 +0200)
commit509aeb980ddb8825bfbbb59f060bbca48918fac8
tree36ee31e0fdaa5bbd36f362d7d4c6cdfa92709642
parent9127d89ef6f731c5e93f8d59a3dd2dd1b3c73e07
parent13f27ae45e641f43a9f7cd2cc6ceef016737ad13
Merge branch 'master' of https://scm.cri.ensmp.fr/git/Faustine

Conflicts:
INSTALL.txt