Merge branch '0.9.x' into pluginize-twitter-bridge

Conflicts:
	plugins/TwitterBridge/twitterauthorization.php

1 files changed, 1 insertions, 1 deletions

diff --git a/extlib/Stomp.php b/extlib/Stomp.php
index 9e1c97b3b..abd9cba62 100644
--- a/extlib/Stomp.php
+++ b/extlib/Stomp.php
@@ -454,7 +454,7 @@ class Stomp
      */
     public function disconnect ()
     {
-		$header = array();
+		$headers = array();
 
 		if ($this->clientId != null) {
 			$headers["client-id"] = $this->clientId;