Merge remote branch 'origin/xorg/1.0.2/master' into xorg/master

author Florent Bruneau <florent.bruneau@polytechnique.org>

Thu, 2 Dec 2010 21:06:05 +0000 (22:06 +0100)

committer Florent Bruneau <florent.bruneau@polytechnique.org>

Thu, 2 Dec 2010 21:06:05 +0000 (22:06 +0100)
author Florent Bruneau <florent.bruneau@polytechnique.org>
Thu, 2 Dec 2010 21:06:05 +0000 (22:06 +0100)
committer Florent Bruneau <florent.bruneau@polytechnique.org>
Thu, 2 Dec 2010 21:06:05 +0000 (22:06 +0100)
diff --cc htdocs/javascript/profile.js
Simple merge
diff --cc modules/admin.php
Simple merge
diff --cc modules/profile.php
Simple merge
diff --cc modules/xnetgrp.php
Simple merge
author	Florent Bruneau <florent.bruneau@polytechnique.org>
	Thu, 2 Dec 2010 21:06:05 +0000 (22:06 +0100)
committer	Florent Bruneau <florent.bruneau@polytechnique.org>
	Thu, 2 Dec 2010 21:06:05 +0000 (22:06 +0100)
		1	2
htdocs/javascript/profile.js	patch \|	diff1 \|	diff2 \|	blob \| history
modules/admin.php	patch \|	diff1 \|	diff2 \|	blob \| history
modules/profile.php	patch \|	diff1 \|	diff2 \|	blob \| history
modules/xnetgrp.php	patch \|	diff1 \|	diff2 \|	blob \| history