2
2
1
Merge branch 'refs/heads/testB'

Conflicts:
	common/phpmodule/news.php