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

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

Conflicts:
	ChangeLog
	Makefile
	classes/userfilter/conditions.inc.php
	core
	htdocs/javascript/do_challenge_response.js
	htdocs/javascript/password.js
	htdocs/javascript/wiki.js
	htdocs/javascript/xorg.js
	include/massmailer.inc.php
	modules/admin.php
	modules/api.php
	modules/axletter/axletter.inc.php
	templates/admin/user.tpl
	templates/axletter/admin.tpl
	templates/axletter/edit.tpl
	templates/axletter/index.tpl
	templates/axletter/show.tpl
	templates/emails/antispam.tpl
	templates/emails/index.tpl
	templates/events/form.tpl
	templates/gadgets/ig-skin.tpl
	templates/lists/index.tpl
	templates/profile/fiche_referent.tpl
	templates/search/index.tpl
	templates/skin/common.bandeau.head.tpl
	templates/skin/common.title.header.tpl
	templates/survey/show_textarea.tpl
	templates/survey/success.tpl

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>