From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Wed, 27 Feb 2008 10:54:39 +0000 (+0100)
Subject: Merge branch 'platal-0.9.15'
X-Git-Tag: xorg/0.9.16~147
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=d0327f6de73e81c4bcc656471ca4161e4f1e1e1b;hp=d0327f6de73e81c4bcc656471ca4161e4f1e1e1b;p=platal.git

Merge branch 'platal-0.9.15'

Conflicts:

	include/validations/paiements.inc.php

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