horazont Merge commit 'refs/pull/4/head' of https://github.com/horazont/xmpp-e… …