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)
1  2 
modules/profile/page.inc.php

Simple merge