From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Sun, 31 Aug 2008 09:25:18 +0000 (+0200)
Subject: Merge branch 'platal-0.9.17'
X-Git-Tag: xorg/0.10.0~109
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=d0edeb70f254ed642b59c7c3636b7802266bcfe4;p=platal.git

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>
---

d0edeb70f254ed642b59c7c3636b7802266bcfe4