Merge branch '0.8.x' into testing

Conflicts:
	actions/twitterauthorization.php
	lib/oauthclient.php
	lib/twitter.php
	lib/twitterapi.php
	lib/twitteroauthclient.php
	scripts/twitterstatusfetcher.php

1 files changed, 4 insertions, 4 deletions

diff --git a/lib/error.php b/lib/error.php
index bbf9987cf..3127c83fe 100644
--- a/lib/error.php
+++ b/lib/error.php
@@ -72,7 +72,7 @@ class ErrorAction extends Action
         $status_string = $this->status[$this->code];
         header('HTTP/1.1 '.$this->code.' '.$status_string);
     }
-    
+
     /**
      * Display content.
      *
@@ -97,11 +97,11 @@ class ErrorAction extends Action
     {
         return true;
     }
-    
-    function showPage() 
+
+    function showPage()
     {
         parent::showPage();
-        
+
         // We don't want to have any more output after this
         exit();
     }