2 Commits

Author	SHA1	Message	Date
Shashi Gowda	31c1177970	Merge branch '1.0.x' into people_tags_rebase ... Conflicts: EVENTS.txt actions/peopletag.php actions/tagother.php classes/Notice.php js/util.js js/util.min.js lib/accountprofileblock.php lib/action.php lib/activityobject.php lib/command.php lib/personalgroupnav.php plugins/OStatus/OStatusPlugin.php	2011-03-22 07:56:25 +05:30
Shashi Gowda	382e4d2cdb	people tag actions	2011-03-07 00:43:31 +05:30