Merge commit 'refs/merge-requests/158' of git://gitorious.org/statusnet/mainline...

author Evan Prodromou <evan@status.net>

Mon, 26 Sep 2011 21:11:49 +0000 (17:11 -0400)

committer Evan Prodromou <evan@status.net>

Mon, 26 Sep 2011 21:11:49 +0000 (17:11 -0400)
author Evan Prodromou <evan@status.net>
Mon, 26 Sep 2011 21:11:49 +0000 (17:11 -0400)
committer Evan Prodromou <evan@status.net>
Mon, 26 Sep 2011 21:11:49 +0000 (17:11 -0400)
diff --cc classes/Profile_list.php
Simple merge
diff --cc classes/Profile_tag.php
Simple merge
author	Evan Prodromou <evan@status.net>
	Mon, 26 Sep 2011 21:11:49 +0000 (17:11 -0400)
committer	Evan Prodromou <evan@status.net>
	Mon, 26 Sep 2011 21:11:49 +0000 (17:11 -0400)
		1	2
classes/Profile_list.php	patch \|	diff1 \|	diff2 \|	blob \| history
classes/Profile_tag.php	patch \|	diff1 \|	diff2 \|	blob \| history