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

author Shashi Gowda <connect2shashi@gmail.com>

Fri, 8 Apr 2011 11:46:20 +0000 (17:16 +0530)

committer Shashi Gowda <connect2shashi@gmail.com>

Fri, 8 Apr 2011 11:46:20 +0000 (17:16 +0530)
author Shashi Gowda <connect2shashi@gmail.com>
Fri, 8 Apr 2011 11:46:20 +0000 (17:16 +0530)
committer Shashi Gowda <connect2shashi@gmail.com>
Fri, 8 Apr 2011 11:46:20 +0000 (17:16 +0530)
diff --cc classes/Notice.php
Simple merge
diff --cc classes/User.php
Simple merge
author	Shashi Gowda <connect2shashi@gmail.com>
	Fri, 8 Apr 2011 11:46:20 +0000 (17:16 +0530)
committer	Shashi Gowda <connect2shashi@gmail.com>
	Fri, 8 Apr 2011 11:46:20 +0000 (17:16 +0530)
		1	2
classes/Notice.php	patch \|	diff1 \|	diff2 \|	blob \| history
classes/User.php	patch \|	diff1 \|	diff2 \|	blob \| history