Merge branch '1.0.x' into feedsub-wizard

author Brion Vibber <brion@pobox.com>

Tue, 15 Mar 2011 23:17:48 +0000 (16:17 -0700)

committer Brion Vibber <brion@pobox.com>

Tue, 15 Mar 2011 23:17:48 +0000 (16:17 -0700)
author Brion Vibber <brion@pobox.com>
Tue, 15 Mar 2011 23:17:48 +0000 (16:17 -0700)
committer Brion Vibber <brion@pobox.com>
Tue, 15 Mar 2011 23:17:48 +0000 (16:17 -0700)
diff --cc plugins/SubMirror/actions/mirrorsettings.php
Simple merge
author	Brion Vibber <brion@pobox.com>
	Tue, 15 Mar 2011 23:17:48 +0000 (16:17 -0700)
committer	Brion Vibber <brion@pobox.com>
	Tue, 15 Mar 2011 23:17:48 +0000 (16:17 -0700)