trying to make sense of the blacklist
Merge pull request #212 from shurizzle/master

trying to make sense of the blacklist
making more sense of the blacklist
Merge pull request #213 from shurizzle/master

making more sense of the blacklist
Merge remote-tracking branch 'origin/master' into db_refactor

Conflicts:
	class/comments.class.php
	class/core.class.php
	class/messages.class.php
	pages/profile.php
	pages/profile/comments.json.php
	pages/profile/refresh.html.php
	pages/search/posts.html.php