Merge branch '0.9.x' into activityexport

diff --cc lib/activity.php
index d3c725e630bd9e7d0cd307b6f231211589f300b0,09a4daee828192e1827c0a31e4e4b2756db28322..f19f10e34dabfd647478d198ea2077c1ba3aaefe
--- 1/lib/activity.php
--- 2/lib/activity.php
+++ b/lib/activity.php
@@@ -388,13 -386,4 +388,12 @@@ class Activit
      {
          return ActivityUtils::child($element, $tag, $namespace);
      }
 +
 +    static function iso8601Date($tm)
 +    {
 +        $dateStr = date('d F Y H:i:s', $tm);
 +        $d = new DateTime($dateStr, new DateTimeZone('UTC'));
 +        $d->setTimezone(new DateTimeZone(common_timezone()));
 +        return $d->format('c');
 +    }
  }
- 

diff --cc lib/activitycontext.php
Simple merge