Merge branch '0.9.x' into inblob

author Evan Prodromou <evan@status.net>

Tue, 12 Jan 2010 00:28:27 +0000 (16:28 -0800)

committer Evan Prodromou <evan@status.net>

Tue, 12 Jan 2010 00:28:27 +0000 (16:28 -0800)
author Evan Prodromou <evan@status.net>
Tue, 12 Jan 2010 00:28:27 +0000 (16:28 -0800)
committer Evan Prodromou <evan@status.net>
Tue, 12 Jan 2010 00:28:27 +0000 (16:28 -0800)
diff --cc plugins/PubSubHubBub/PubSubHubBubPlugin.php
Simple merge
author	Evan Prodromou <evan@status.net>
	Tue, 12 Jan 2010 00:28:27 +0000 (16:28 -0800)
committer	Evan Prodromou <evan@status.net>
	Tue, 12 Jan 2010 00:28:27 +0000 (16:28 -0800)