2 commits

Author	SHA1	Message	Date
Maxwell Salzberg	a36d5558db	use merge not merge! so we dont create false user objects	2012-04-05 11:42:32 -07:00
Dennis Collinson	558ceec92a	a user can mark themselves as nsfw	2012-02-07 19:03:20 -08:00