From: Evan Prodromou <evan@status.net>
Date: Wed, 22 Dec 2010 20:05:40 +0000 (-0800)
Subject: Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=e11ca1e0521a3fa305b6e4e70649690569766a11;p=quix0rs-gnu-social.git

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

e11ca1e0521a3fa305b6e4e70649690569766a11
diff --cc lib/activityobject.php
index fc7da7ee8b,5185d77610..b86e6a9846
--- a/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
       *