Merge branch 'people_tags_rebase' into 1.0.x
authorZach Copley <zach@status.net>
Sun, 10 Apr 2011 08:10:01 +0000 (08:10 +0000)
committerZach Copley <zach@status.net>
Sun, 10 Apr 2011 08:10:01 +0000 (08:10 +0000)
commite75c9988ebe33822e493ac225859bc593ff9b855
tree94b1e374a8d77d5f102b8157cc47edd110c2bac4
parent396005ecf65dfd3b3376257fba80e0c4f0bc7578
parentfc21e5c76bf6fd6fa8947360b5e6e4b3f26d43de
Merge branch 'people_tags_rebase' into 1.0.x

Conflicts:
EVENTS.txt
EVENTS.txt
lib/util.php