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
..
2011-03-06 23:26:27 +05:30
2010-02-25 22:30:04 -05:00
2010-01-13 17:28:31 -08:00
2010-07-28 11:43:47 -04:00
2011-03-06 23:26:27 +05:30