Merge branch '1.0.x' into limitdist

author Evan Prodromou <evan@status.net>

Wed, 23 Mar 2011 19:58:27 +0000 (15:58 -0400)

committer Evan Prodromou <evan@status.net>

Wed, 23 Mar 2011 19:58:27 +0000 (15:58 -0400)
author Evan Prodromou <evan@status.net>
Wed, 23 Mar 2011 19:58:27 +0000 (15:58 -0400)
committer Evan Prodromou <evan@status.net>
Wed, 23 Mar 2011 19:58:27 +0000 (15:58 -0400)
diff --cc classes/Notice.php
Simple merge
diff --cc classes/Profile.php
Simple merge
author	Evan Prodromou <evan@status.net>
	Wed, 23 Mar 2011 19:58:27 +0000 (15:58 -0400)
committer	Evan Prodromou <evan@status.net>
	Wed, 23 Mar 2011 19:58:27 +0000 (15:58 -0400)
		1	2
classes/Notice.php	patch \|	diff1 \|	diff2 \|	blob \| history
classes/Profile.php	patch \|	diff1 \|	diff2 \|	blob \| history