Merge branch 'platal-1.0.0'
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Fri, 17 Sep 2010 12:36:31 +0000 (14:36 +0200)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Fri, 17 Sep 2010 12:36:31 +0000 (14:36 +0200)
commitf74509fbb4f06820dc3d028e3ffd2145f151b013
tree13e34b21aa501f85ddf72c2564f7d248efc35aae
parent52858d0e9a9d4458de1d11ec89eb239cd3966af0
parent37271026758e9eea61b16ea38e3392e880f9a694
Merge branch 'platal-1.0.0'

Conflicts:
core

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