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)
Conflicts:
INSTALL.txt


Trivial merge