Merge branch 'master' into csrf

Conflicts:
	includes/admin.php
pull/4/head
Joseph Haig 10 years ago
commit 2c86f262ba

Diff Content Not Available