Brion Vibber 9684cbe3c6 Merge branch 'testing' into 0.9.x
Conflicts:
	plugins/OpenID/openidserver.php
2010-06-16 12:38:35 -07:00
..
2010-06-16 12:38:35 -07:00