From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Mon, 18 May 2009 23:28:08 +0000 (+0000)
Subject: Merge branch '0.7.x' into 0.8.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8b5bcae58fba59734a566315f04499fcc1433c75;p=quix0rs-gnu-social.git

Merge branch '0.7.x' into 0.8.x

Conflicts:

	EVENTS.txt
---

8b5bcae58fba59734a566315f04499fcc1433c75
diff --cc EVENTS.txt
index d689f0be63,e0ce116667..8e917f11de
--- a/EVENTS.txt
+++ b/EVENTS.txt
@@@ -103,9 -109,5 +109,11 @@@ EndSubGroupNav: At the end of the subsc
  RouterInitialized: After the router instance has been initialized
  - $m: the Net_URL_Mapper that has just been set up
  
 +StartLogout: Before logging out
 +- $action: the logout action
 +
 +EndLogout: After logging out
 +- $action: the logout action
 +
+ ArgsInitialized: After the argument array has been initialized
+ - $args: associative array of arguments, can be modified