modified:   upgrade/dx2_to_xn2.php
Merge branch 'master' of github.com:xiuno/xiunobbs
	modified:   model/forum.class.php
	modified:   control/common_control.class.php