Whitelist allowed filters in /user (s1).
Properly escape discussion name in dashboard summaries (s5).
Get stub IPLog tables out of master.
Merge branch 'master' of github.com:vanillaforums/Garden
Fix IP matching when a proxy is used.
Merge branch 'master' into hotfix/2.1a35
Merge branch 'hotfix/2.1a35'
Fix typo.
Give the app another feature bump.
htmlspecialchars the category name for table headings.
Set the proper application/javascript content type for jsonp responses.
Merge branch 'master' into release/2.1b1

Conflicts:
	index.php