Merge branch '0.9.x' into activityexport

Conflicts:
	plugins/OStatus/OStatusPlugin.php

1 files changed, 11 insertions, 1 deletions

diff --git a/plugins/Comet/CometPlugin.php b/plugins/Comet/CometPlugin.php
index 29cb3004b..70b324b5c 100644
--- a/plugins/Comet/CometPlugin.php
+++ b/plugins/Comet/CometPlugin.php
@@ -42,7 +42,6 @@ require_once INSTALLDIR.'/plugins/Realtime/RealtimePlugin.php';
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-
 class CometPlugin extends RealtimePlugin
 {
     public $server   = null;
@@ -104,4 +103,15 @@ class CometPlugin extends RealtimePlugin
         }
         return '/' . implode('/', $path);
     }
+
+    function onPluginVersion(&$versions)
+    {
+        $versions[] = array('name' => 'Comet',
+                            'version' => STATUSNET_VERSION,
+                            'author' => 'Evan Prodromou',
+                            'homepage' => 'http://status.net/wiki/Plugin:Comet',
+                            'rawdescription' =>
+                            _m('Plugin to do "real time" updates using Comet/Bayeux.'));
+        return true;
+    }
 }