Merge branch 'platal-0.9.15'
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Wed, 27 Feb 2008 10:54:39 +0000 (11:54 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Wed, 27 Feb 2008 10:54:39 +0000 (11:54 +0100)
commitd0327f6de73e81c4bcc656471ca4161e4f1e1e1b
tree68c788dfea263b365a8a7908af5a728bf0db0ca8
parentebb129a4d4a406943e2dd936a112878856533124
parent6c4b500599f8aa2eb9394bb67a5b65401ca8d7b4
Merge branch 'platal-0.9.15'

Conflicts:

include/validations/paiements.inc.php

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