Merge branch '1.0.x' into schema-x

author Brion Vibber <brion@pobox.com>

Tue, 2 Nov 2010 22:02:55 +0000 (15:02 -0700)

committer Brion Vibber <brion@pobox.com>

Tue, 2 Nov 2010 22:02:55 +0000 (15:02 -0700)
author Brion Vibber <brion@pobox.com>
Tue, 2 Nov 2010 22:02:55 +0000 (15:02 -0700)
committer Brion Vibber <brion@pobox.com>
Tue, 2 Nov 2010 22:02:55 +0000 (15:02 -0700)
diff --cc classes/Profile.php
Simple merge
diff --cc plugins/OStatus/classes/Ostatus_profile.php
Simple merge
author	Brion Vibber <brion@pobox.com>
	Tue, 2 Nov 2010 22:02:55 +0000 (15:02 -0700)
committer	Brion Vibber <brion@pobox.com>
	Tue, 2 Nov 2010 22:02:55 +0000 (15:02 -0700)
		1	2
classes/Profile.php	patch \|	diff1 \|	diff2 \|	blob \| history
plugins/OStatus/classes/Ostatus_profile.php	patch \|	diff1 \|	diff2 \|	blob \| history