Merge fail (bis).
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Mon, 31 Jan 2011 19:29:26 +0000 (20:29 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Mon, 31 Jan 2011 19:29:26 +0000 (20:29 +0100)
commit3fff1bdd0249f2ad4604b4305099583c407e01a0
treeb2f78063ed62a3ef0caacfa8f709b07a6e6eed4b
parentd8923e947be2eeac61d184b23921f7cc7df6a12b
Merge fail (bis).

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