From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Fri, 21 May 2010 19:18:56 +0000 (+0200)
Subject: Merge remote branch 'origin/platal-0.10.2'
X-Git-Tag: xorg/1.0.0~249
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=93d42b4fcc6f055a428c9b63e386ac62c918d08a;p=platal.git

Merge remote branch 'origin/platal-0.10.2'

Conflicts:
	include/emails.inc.php

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

93d42b4fcc6f055a428c9b63e386ac62c918d08a