no message
Merge branch 'master' of https://github.com/MartinHartmanndk/project_php

Conflicts:
	modules/forum/forum_admin.php