Merge branch '1.1.x'

author Evan Prodromou <evan@status.net>

Tue, 3 Jul 2012 16:27:34 +0000 (12:27 -0400)

committer Evan Prodromou <evan@status.net>

Tue, 3 Jul 2012 16:27:34 +0000 (12:27 -0400)
author Evan Prodromou <evan@status.net>
Tue, 3 Jul 2012 16:27:34 +0000 (12:27 -0400)
committer Evan Prodromou <evan@status.net>
Tue, 3 Jul 2012 16:27:34 +0000 (12:27 -0400)
diff --cc plugins/FacebookBridge/locale/it/LC_MESSAGES/FacebookBridge.po
Simple merge
author	Evan Prodromou <evan@status.net>
	Tue, 3 Jul 2012 16:27:34 +0000 (12:27 -0400)
committer	Evan Prodromou <evan@status.net>
	Tue, 3 Jul 2012 16:27:34 +0000 (12:27 -0400)