Brion Vibber 7005ef6661 Merge branch 'testing' into 0.9.x
Conflicts:
	plugins/OpenID/openidlogin.php
2010-05-19 12:51:25 -07:00
..
2010-05-19 12:51:25 -07:00
2010-03-25 16:35:22 -04:00
2010-03-12 10:07:32 -08:00
2010-03-12 10:07:32 -08:00