Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase

Conflicts: classes/Profile.php
2011-03-22 07:59:06 +05:30
parent 31c1177970 61960d3668
commit bf121a695a
39 changed files with 1444 additions and 450 deletions
--- a/plugins/OStatus/OStatusPlugin.php
+++ b/plugins/OStatus/OStatusPlugin.php
@@ -788,7 +788,7 @@ class OStatusPlugin extends Plugin
     * it'll be left with a stray membership record.
     *
     * @param User_group $group
-     * @param User $user
+     * @param Profile $user
     *
     * @return mixed hook return value
     */