Merge branch 'blacklistplus' into testing

Conflicts:
	EVENTS.txt

diff --cc EVENTS.txt
index c387274c03f55fed99d400eb6b322ad8003eba58,b4fc4cbebeb440cd50c73334080dda8f147ee6ff..a2b405acc8e07f01a829e93ed69478088929cfb9
--- 1/EVENTS.txt
--- 2/EVENTS.txt
+++ b/EVENTS.txt
@@@ -722,50 -714,19 +722,67 @@@ StartRobotsTxt: Before outputting the r
  EndRobotsTxt: After the default robots.txt page (good place for customization)
  - &$action: RobotstxtAction being shown
  
 +StartGetProfileUri: When determining the canonical URI for a given profile
 +- $profile: the current profile
 +- &$uri: the URI
 +
 +EndGetProfileUri: After determining the canonical URI for a given profile
 +- $profile: the current profile
 +- &$uri: the URI
 +
 +StartFavorNotice: Saving a notice as a favorite
 +- $profile: profile of the person faving (can be remote!)
 +- $notice: notice being faved
 +- &$fave: Favor object; null to start off with, but feel free to override.
 +
 +EndFavorNotice: After saving a notice as a favorite
 +- $profile: profile of the person faving (can be remote!)
 +- $notice: notice being faved
 +
 +StartDisfavorNotice: Saving a notice as a favorite
 +- $profile: profile of the person faving (can be remote!)
 +- $notice: notice being faved
 +- &$result: result of the disfavoring (if you override)
 +
 +EndDisfavorNotice: After saving a notice as a favorite
 +- $profile: profile of the person faving (can be remote!)
 +- $notice: notice being faved
 +
 +StartFindMentions: start finding mentions in a block of text
 +- $sender: sender profile
 +- $text: plain text version of the notice
 +- &$mentions: mentions found so far. Array of arrays; each array
 +  has 'mentioned' (array of mentioned profiles), 'url' (url to link as),
 +  'title' (title of the link), 'position' (position of the text to
 +  replace), 'text' (text to replace)
 +
 +EndFindMentions: end finding mentions in a block of text
 +- $sender: sender profile
 +- $text: plain text version of the notice
 +- &$mentions: mentions found so far. Array of arrays; each array
 +  has 'mentioned' (array of mentioned profiles), 'url' (url to link as),
 +  'title' (title of the link), 'position' (position of the text to
 +  replace), 'text' (text to replace)
 +
 +StartShowSubscriptionsContent: before showing the subscriptions content
 +- $action: the current action
 +
 +EndShowSubscriptionsContent: after showing the subscriptions content
 +- $action: the current action
++
+ StartDeleteUserForm: starting the data in the form for deleting a user
+ - $action: action being shown
+ - $user: user being deleted
+ 
+ EndDeleteUserForm: Ending the data in the form for deleting a user
+ - $action: action being shown
+ - $user: user being deleted
+ 
+ StartDeleteUser: handling the post for deleting a user
+ - $action: action being shown
+ - $user: user being deleted
+ 
+ EndDeleteUser: handling the post for deleting a user
+ - $action: action being shown
+ - $user: user being deleted
+ 

diff --cc lib/action.php
Simple merge