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

This commit is contained in:
Evan Prodromou 2010-12-22 12:05:40 -08:00
commit e11ca1e052

View File

@ -105,6 +105,7 @@ class ActivityObject
public $thumbnail; public $thumbnail;
public $largerImage; public $largerImage;
public $description; public $description;
public $extra = array();
// Extra stuff, that may need to be serialized // Extra stuff, that may need to be serialized