Merge branch 'people_tags_rebase' into 1.0.x

Conflicts:
	EVENTS.txt

diff --cc EVENTS.txt
index eb848bb888dcd09d41f456be1de8e41b6756f9cb,80708ed8822a7680d52550fba463317278612d8f..4614ef3da5f636289e4b411e74eeedd24b785a03
--- 1/EVENTS.txt
--- 2/EVENTS.txt
+++ b/EVENTS.txt
@@@ -1160,26 -1310,6 +1310,27 @@@ StartShowGroupProfileBlock: When showin
  - $out: XMLOutputter to append custom output
  - $profile: the profile being shown
  
--EndShowGroupProfileBlock: After showing showing the profile block for a group
++EndShowGroupProfileBlock: After showing the profile block for a group
  - $out: XMLOutputter to append custom output
  - $group: the group being shown
 +
 +StartShowThreadedNoticeTail: when showing the replies etc. to a notice
 +- $nli: parent noticelistitem
 +- $notice: parent notice
 +- &$children: list of children
 +
 +EndShowThreadedNoticeTail: when showing the replies etc. to a notice
 +- $nli: parent noticelistitem
 +- $notice: parent notice
 +- $children: list of children
 +
 +StartShowThreadedNoticeSub: when showing a reply to a notice
 +- $nli: parent noticelistitem
 +- $parent: parent notice
 +- $child: child notice
 +
 +EndShowThreadedNoticeSub: when showing a reply to a notice
 +- $nli: parent noticelistitem
 +- $parent: parent notice
 +- $child: child notice
++

diff --cc lib/util.php
Simple merge