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

2010-12-22 12:05:40 -08:00 · 2010-12-22 12:05:40 -08:00 · e11ca1e052
commit e11ca1e052
parent a01742244e 448dfb69d4
1 changed files with 1 additions and 0 deletions
--- a/lib/activityobject.php
+++ b/lib/activityobject.php
@ -105,6 +105,7 @@ class ActivityObject
    public $thumbnail;
    public $largerImage;
    public $description;
+    public $extra = array();

    // Extra stuff, that may need to be serialized