Conflicts merged manually - please check
	lib/wiki-plugins/wikiplugin_listpages.php
	lib/wiki-plugins/wikiplugin_survey.php
	lib/wiki-plugins/wikiplugin_poll.php (?)
	lib/wiki-plugins/wikiplugin_code.php
	lib/wiki-plugins/wikiplugin_file.php
	lib/blogs/bloglib.php