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

Changed the ejabberd import script to use util.serialization

Added module util.serialization

Abstract xmlhandlers a bit more, also add error callbacks

Don't send stream:features to incoming s2s connections

Fix logger ids for c2s and s2sout

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

Change modules to use the new add_feature module API method.

Added function add_feature to modules API (for adding disco features)

Reorder the disco info elements to place always included elements first

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

mercurial