# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1306969533 -3600
# Node ID 9808e2b32aa5d1f4f7d1f1e0a8476475bd8ade6a
# Parent  7cc426988bcc818473fdffda9c2070773975f0a0# Parent  67ce42aa7419fa15cbd45a88cfec7e852546160f
Merge 0.8->trunk

diff -r 7cc426988bcc -r 9808e2b32aa5 util/xmppstream.lua