Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x

diff --cc lib/activityobject.php
index fc7da7ee8b15b6209a93a36cb318d24ab00440b4,5185d7761055951ab86a3cff18a8322c38384f25..b86e6a98461591cf2073f4bf1088588f2474c9e4
--- 1/lib/activityobject.php
--- 2/lib/activityobject.php
+++ b/lib/activityobject.php
@@@ -105,11 -105,8 +105,12 @@@ class ActivityObjec
      public $thumbnail;
      public $largerImage;
      public $description;
+     public $extra = array();
  
 +    // Extra stuff, that may need to be serialized
 +
 +    public $extra = array();
 +
      /**
       * Constructor
       *