From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Sun, 25 May 2008 12:47:54 +0000 (+0200)
Subject: Merge branch 'platal-0.9.16'
X-Git-Tag: core/1.0.0~174
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=58d1d33c646a2c67244dd12398b993ce850b9b69;p=platal.git

Merge branch 'platal-0.9.16'

Conflicts:

	modules/auth/auth.inc.php

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
---

58d1d33c646a2c67244dd12398b993ce850b9b69