Merge branch 'platal-0.9.17'
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 31 Aug 2008 09:25:18 +0000 (11:25 +0200)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 31 Aug 2008 09:25:18 +0000 (11:25 +0200)
commitd0edeb70f254ed642b59c7c3636b7802266bcfe4
tree7612c531a5c178ad22bd4f07cf2f54e392a006c9
parentc1bae0aa0ec03edc20726e6a5615433460c9fe9c
parent933d9a4c9cb3b8065f5d088a991c9dee9a0229b8
Merge branch 'platal-0.9.17'

Conflicts:

templates/events/rss.tpl
templates/xnetgrp/announce-rss.tpl

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
include/validations/nomusage.inc.php