garzgul/carpediem — pull request #99 by garzgul (2014-09-17 09:19:18+00:00)
Title: Merge origin/Emmanuelle into Gael

Conflicts:
src/java/servlet/Controleur.java