Merge 1.1.x into master

author Evan Prodromou <evan@e14n.com>

Tue, 16 Jul 2013 17:57:06 +0000 (10:57 -0700)

committer Evan Prodromou <evan@e14n.com>

Tue, 16 Jul 2013 17:57:06 +0000 (10:57 -0700)
author Evan Prodromou <evan@e14n.com>
Tue, 16 Jul 2013 17:57:06 +0000 (10:57 -0700)
committer Evan Prodromou <evan@e14n.com>
Tue, 16 Jul 2013 17:57:06 +0000 (10:57 -0700)
diff --cc classes/Profile.php
Simple merge
diff --cc plugins/TwitterBridge/TwitterBridgePlugin.php
Simple merge
diff --cc theme/base/css/display.css
Simple merge
author	Evan Prodromou <evan@e14n.com>
	Tue, 16 Jul 2013 17:57:06 +0000 (10:57 -0700)
committer	Evan Prodromou <evan@e14n.com>
	Tue, 16 Jul 2013 17:57:06 +0000 (10:57 -0700)
		1	2
classes/Profile.php	patch \|	diff1 \|	diff2 \|	blob \| history
plugins/TwitterBridge/TwitterBridgePlugin.php	patch \|	diff1 \|	diff2 \|	blob \| history
theme/base/css/display.css	patch \|	diff1 \|	diff2 \|	blob \| history