Merge commit 'origin/fusionax' into account
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Mon, 29 Dec 2008 15:51:08 +0000 (16:51 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Mon, 29 Dec 2008 15:51:08 +0000 (16:51 +0100)
commit076412639089ff7a5dfd8ae1652faf1683c322e5
tree91fa9de8117e6a1f4602c1315d924caed431eee6
parent35accc05937cab56b7002899c77b0a53b381a53a
parente8a898662eeafa5201082067a7aac46573884ebb
Merge commit 'origin/fusionax' into account
include/user.func.inc.php