Evan Prodromou b34e267e53 Merge branch '1.0.x' into testing
Conflicts:
	plugins/EmailRegistration/scripts/cancelemailregistration.php
2011-05-23 18:20:18 -04:00
..
2011-04-08 01:22:02 +02:00
2011-05-20 16:56:12 +02:00