Merge branch '1.0.x' into testing

author Evan Prodromou <evan@status.net>

Thu, 5 May 2011 01:45:23 +0000 (18:45 -0700)

committer Evan Prodromou <evan@status.net>

Thu, 5 May 2011 01:45:23 +0000 (18:45 -0700)
author Evan Prodromou <evan@status.net>
Thu, 5 May 2011 01:45:23 +0000 (18:45 -0700)
committer Evan Prodromou <evan@status.net>
Thu, 5 May 2011 01:45:23 +0000 (18:45 -0700)
diff --cc plugins/EmailRegistration/emailregister.php
Simple merge
author	Evan Prodromou <evan@status.net>
	Thu, 5 May 2011 01:45:23 +0000 (18:45 -0700)
committer	Evan Prodromou <evan@status.net>
	Thu, 5 May 2011 01:45:23 +0000 (18:45 -0700)