*Merge.

--HG-- branch : trunk
2009-02-18 11:36:19 -06:00
parent 017f309b5b 7bff1c1d60
commit 31637d4aac
2384 changed files with 9729 additions and 969 deletions
@@ -213,3 +213,4 @@ private:

 // todo: flag carrier death/leave/mount/activitychange should give back the gossip options
 #endif
+