Merge branch '1.0.x' into limitdist2

author Evan Prodromou <evan@status.net>

Tue, 29 Mar 2011 01:56:34 +0000 (21:56 -0400)

committer Evan Prodromou <evan@status.net>

Tue, 29 Mar 2011 01:56:34 +0000 (21:56 -0400)
author Evan Prodromou <evan@status.net>
Tue, 29 Mar 2011 01:56:34 +0000 (21:56 -0400)
committer Evan Prodromou <evan@status.net>
Tue, 29 Mar 2011 01:56:34 +0000 (21:56 -0400)
diff --cc classes/Profile.php
Simple merge
diff --cc classes/statusnet.ini
Simple merge
diff --cc db/core.php
Simple merge
author	Evan Prodromou <evan@status.net>
	Tue, 29 Mar 2011 01:56:34 +0000 (21:56 -0400)
committer	Evan Prodromou <evan@status.net>
	Tue, 29 Mar 2011 01:56:34 +0000 (21:56 -0400)
		1	2
classes/Profile.php	patch \|	diff1 \|	diff2 \|	blob \| history
classes/statusnet.ini	patch \|	diff1 \|	diff2 \|	blob \| history
db/core.php	patch \|	diff1 \|	diff2 \|	blob \| history