Automated merge with http://waqas.ath.cx:8000/

MUC: Added logging

Automated merge with http://waqas.ath.cx:8000/

MUC: Various fixes

MUC: Fixed: Presence for user joining the roomi was sent twice to the user

mod_bosh: Possible fix for invalid key to next crash

net.server: Fix some more potential nil handler accesses

Merge from waqas

Merge waqas with waqas

MUC: Made vCards work by redirecting vCard requests to bare JIDs

(0) -300 -100 -10 +10 +100 +300 +1000 +3000 tip

mercurial