Merge jabberd2