Merge branch '0.8.x' into deleteuser

author Evan Prodromou <evan@status.net>

Fri, 2 Oct 2009 19:27:55 +0000 (15:27 -0400)

committer Evan Prodromou <evan@status.net>

Fri, 2 Oct 2009 19:27:55 +0000 (15:27 -0400)
author Evan Prodromou <evan@status.net>
Fri, 2 Oct 2009 19:27:55 +0000 (15:27 -0400)
committer Evan Prodromou <evan@status.net>
Fri, 2 Oct 2009 19:27:55 +0000 (15:27 -0400)
diff --cc classes/Profile.php
Simple merge
diff --cc classes/User.php
Simple merge
author	Evan Prodromou <evan@status.net>
	Fri, 2 Oct 2009 19:27:55 +0000 (15:27 -0400)
committer	Evan Prodromou <evan@status.net>
	Fri, 2 Oct 2009 19:27:55 +0000 (15:27 -0400)
		1	2
classes/Profile.php	patch \|	diff1 \|	diff2 \|	blob \| history
classes/User.php	patch \|	diff1 \|	diff2 \|	blob \| history