garzgul/carpediem — pull request #95 by garzgul (2014-09-17 05:24:50+00:00)
Title: merge mardi soir

Conflicts:
web/WEB-INF/bordure/AffichageTheme.jsp