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

diff --cc ChangeLog
Simple merge

diff --cc bin/lists.rpc.py
Simple merge

diff --cc classes/profile.php
Simple merge

diff --cc include/userset.inc.php
Simple merge

diff --cc modules/email.php
Simple merge

diff --cc modules/fusionax.php
Simple merge

diff --cc modules/lists.php
Simple merge

diff --cc modules/xnetevents.php
Simple merge

diff --cc modules/xnetgrp.php
Simple merge