Merge commit 'refs/merge-requests/45' of https://gitorious.org/social/mainline into...

diff --combined EVENTS.txt
index 8f094d16434a3b86e270806e758ce769e68f2b33,66a86652e96e243e13eb6202aa99c09f3b2a0153..b98c6ff52fda2a06e6b26ce9ae2a270a0a816c5b
--- 1/EVENTS.txt
--- 2/EVENTS.txt
+++ b/EVENTS.txt
@@@ -627,10 -627,10 +627,10 @@@ EndSetUser: After setting the currentl
  - $user: user
  
  StartSetApiUser: Before setting the current API user
 -- $user: user
 +- &$user: user, can be set during event handling (return false to stop processing)
  
  EndSetApiUser: After setting the current API user
 -- $user: user
 +- $user: user, only called if this is an actual user
  
  StartHasRole: Before determing if the a profile has a given role
  - $profile: profile in question
@@@ -1463,3 -1463,12 +1463,12 @@@ StartNotifyMentioned: During notice dis
  EndNotifyMentioned: During notice distribution, we send notifications (email, im...) to the profiles who were somehow mentioned.
  - $stored:         Notice object that is being distributed.
  - $mentioned_ids:  Array of profile IDs (not just for local users) who got mentioned by the notice.
+ 
+ StartHomeStubNavItems: Go back Home nav items. Default includes just one item 'home'
+ - $action: action being executed (for output and params)
+ - $items: array of items in the nav
+ 
+ EndHomeStubNavItems:
+ - $action: action being executed (for output and params)
+ - $items: array of items in the nav
+