Merge commit 'origin/fusionax' into account
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Fri, 6 Mar 2009 21:52:14 +0000 (22:52 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Fri, 6 Mar 2009 21:52:14 +0000 (22:52 +0100)
commitd2100923749766ffcf61745b0145cf82a3886716
tree8f103f41c33462b1f75ac24b2fe273f6512db12a
parente718bd187b7460423a8a5b0fba032a6d271d86c7
parent5112531d976339fcb6be3846dd7f8754e7547311
Merge commit 'origin/fusionax' into account
modules/profile/page.inc.php