Merge in r649-656, prompted by changing two of Encoder's functions to static.

git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/branches/strict@657 48356398-32a2-884e-a903-53898d9a118a

tests/Debugger.php

@@ -70,6 +70,9 @@ class Debugger
         $this->add_pre = !extension_loaded('xdebug');
     }
     
+    /**
+     * @static
+     */
     static function &instance() {
         static $soleInstance = false;
         if (!$soleInstance) $soleInstance = new Debugger();
@@ -142,4 +145,4 @@ class Debugger
     
 }
 
-?>
+?>