Merge remote branch 'origin/xorg/1.0.2/master' into xorg/master
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Thu, 2 Dec 2010 21:06:05 +0000 (22:06 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Thu, 2 Dec 2010 21:06:05 +0000 (22:06 +0100)
commit34c0246248ed6e3c6a372c89b359ce038bb95bc8
tree86bf951047dff7ee0bf4980b0ff1b7bdd8085283
parentf336915bd25f046ed90b4d7e144384d7242adc97
parent7f7b00425f9cb2dc2a611cd1ca985813893d5bfe
Merge remote branch 'origin/xorg/1.0.2/master' into xorg/master
htdocs/javascript/profile.js
modules/admin.php
modules/profile.php
modules/xnetgrp.php