Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
authorShashi Gowda <connect2shashi@gmail.com>
Sat, 9 Apr 2011 16:27:45 +0000 (21:57 +0530)
committerShashi Gowda <connect2shashi@gmail.com>
Sat, 9 Apr 2011 16:27:45 +0000 (21:57 +0530)
commitf47027abbefe35d17df50c67eec7cd1156a5e39a
treeceb840c2ce79be3bf9263424cf35073005c10cc6
parenta0ac51c22f4fd154f9f44a84ce3df79634a7b8ef
parent285c2ee72dc254988a38d591c71efc726a8d6de4
Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase

Conflicts:
lib/profileblock.php
theme/default/css/display.css
EVENTS.txt
classes/Notice.php
classes/Profile.php
classes/User.php
lib/accountprofileblock.php
lib/default.php
lib/profileblock.php
theme/neo/css/display.css
theme/rebase/css/display.css