Merge 1.1.x into master

2013-07-16 10:57:06 -07:00
parent 783e400d94 89ba820246
commit 3fc1d245a1
18 changed files with 931 additions and 81 deletions
--- a/plugins/TwitterBridge/TwitterBridgePlugin.php
+++ b/plugins/TwitterBridge/TwitterBridgePlugin.php
@@ -204,6 +204,7 @@ class TwitterBridgePlugin extends Plugin
            return false;
        case 'TwitterOAuthClient':
        case 'TwitterQueueHandler':
+        case 'TweetInQueueHandler':
        case 'TwitterImport':
        case 'JsonStreamReader':
        case 'TwitterStreamReader':