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, 3 insertions, 1 deletions

diff --git a/lib/arraywrapper.php b/lib/arraywrapper.php
index a8a12b3bb..47ae057dc 100644
--- a/lib/arraywrapper.php
+++ b/lib/arraywrapper.php
@@ -25,12 +25,14 @@ class ArrayWrapper
 {
     var $_items = null;
     var $_count = 0;
+    var $N = 0;
     var $_i = -1;
 
     function __construct($items)
     {
         $this->_items = $items;
         $this->_count = count($this->_items);
+        $this->N = $this->_count;
     }
 
     function fetch()
@@ -76,4 +78,4 @@ class ArrayWrapper
         $item =& $this->_items[$this->_i];
         return call_user_func_array(array($item, $name), $args);
     }
-}
\ No newline at end of file
+}