Merge branch 'master' of https://scm.cri.ensmp.fr/git/Faustine
authorKarim Barkati <karimbarkati@gmail.com>
Tue, 27 Aug 2013 17:16:23 +0000 (19:16 +0200)
committerKarim Barkati <karimbarkati@gmail.com>
Tue, 27 Aug 2013 17:16:23 +0000 (19:16 +0200)

Trivial merge