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
..
2010-09-06 10:07:43 -04:00
2010-07-29 13:01:04 +02:00
2010-07-29 13:01:04 +02:00
2011-03-06 23:28:03 +05:30
2011-03-06 23:28:03 +05:30
2011-01-26 18:35:01 -07:00
2010-04-30 15:29:05 -07:00
2011-03-06 23:28:03 +05:30