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
..
display.css	Merge branch '1.0.x' into people_tags_rebase	2011-03-22 07:56:25 +05:30
ie.css	de-IDifying labels in notice form to fix issue with geo pin activating the wrong place when cloning the form	2011-03-08 12:14:44 -08:00