Merge branch 'platal-0.9.17'
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Mon, 6 Oct 2008 15:16:22 +0000 (17:16 +0200)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Mon, 6 Oct 2008 15:16:22 +0000 (17:16 +0200)
commit55546c0db778c2d8f9d7debd30117931dc39ff16
tree61753332c93d44a66f75df6656de8d73e884f6c8
parent44b071c2ad111a7e41f00f614c04633601a93344
parent2b1b17af7b1e695ac77cf99f86396c07d47b224f
Merge branch 'platal-0.9.17'

Conflicts:

plugins/compiler.checkpasswd.php
templates/events/rss.tpl
templates/xnetgrp/announce-rss.tpl

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
modules/payment.php
templates/events/rss.tpl
templates/googleapps/index.tpl
templates/xnetgrp/announce-rss.tpl