Merge branch '1.0.x' into schema-x

author Brion Vibber <brion@pobox.com>

Wed, 13 Oct 2010 22:46:45 +0000 (15:46 -0700)

committer Brion Vibber <brion@pobox.com>

Wed, 13 Oct 2010 22:46:45 +0000 (15:46 -0700)
author Brion Vibber <brion@pobox.com>
Wed, 13 Oct 2010 22:46:45 +0000 (15:46 -0700)
committer Brion Vibber <brion@pobox.com>
Wed, 13 Oct 2010 22:46:45 +0000 (15:46 -0700)
diff --cc plugins/OStatus/classes/Ostatus_profile.php
Simple merge
author	Brion Vibber <brion@pobox.com>
	Wed, 13 Oct 2010 22:46:45 +0000 (15:46 -0700)
committer	Brion Vibber <brion@pobox.com>
	Wed, 13 Oct 2010 22:46:45 +0000 (15:46 -0700)