Merge branch 'master' of https://scm.cri.ensmp.fr/git/Faustine
authorWANG <wang@wang-OptiPlex-780.(none)>
Mon, 16 Sep 2013 15:56:12 +0000 (17:56 +0200)
committerWANG <wang@wang-OptiPlex-780.(none)>
Mon, 16 Sep 2013 15:56:12 +0000 (17:56 +0200)
commit1059e1cc0c2ecfa237406949aa26155b6a5b9154
treea639c18a3a8947de3a96fe88b60ce3adc3f48784
parent829259826b29edc284ec43810bb505a832091dda
parentc21be74684e409aaf08937e776c6cedce35b8fc0
Merge branch 'master' of https://scm.cri.ensmp.fr/git/Faustine

Conflicts:
examples/Makefile
examples/Makefile