Minority changes...
accepted. Untracked many unnecessary files.
Merge remote-tracking branch 'origin/hguhis' into hguhis

Conflicts:
	hguhis/modules/hiswiki/hiswiki.view.php