Merge branch 'testing' into 1.0.x

author Evan Prodromou <evan@status.net>

Tue, 7 Jun 2011 20:04:49 +0000 (16:04 -0400)

committer Evan Prodromou <evan@status.net>

Tue, 7 Jun 2011 20:04:49 +0000 (16:04 -0400)
author Evan Prodromou <evan@status.net>
Tue, 7 Jun 2011 20:04:49 +0000 (16:04 -0400)
committer Evan Prodromou <evan@status.net>
Tue, 7 Jun 2011 20:04:49 +0000 (16:04 -0400)
diff --cc locale/eo/LC_MESSAGES/statusnet.po
Simple merge
diff --cc plugins/Directory/locale/mk/LC_MESSAGES/Directory.po
Simple merge
diff --cc plugins/Directory/locale/tl/LC_MESSAGES/Directory.po
Simple merge
author	Evan Prodromou <evan@status.net>
	Tue, 7 Jun 2011 20:04:49 +0000 (16:04 -0400)
committer	Evan Prodromou <evan@status.net>
	Tue, 7 Jun 2011 20:04:49 +0000 (16:04 -0400)
		1	2
locale/eo/LC_MESSAGES/statusnet.po	patch \|	diff1 \|	diff2 \|	blob \| history
plugins/Directory/locale/mk/LC_MESSAGES/Directory.po	patch \|	diff1 \|	diff2 \|	blob \| history
plugins/Directory/locale/tl/LC_MESSAGES/Directory.po	patch \|	diff1 \|	diff2 \|	blob \| history