# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1306967199 -3600
# Node ID 67ce42aa7419fa15cbd45a88cfec7e852546160f
# Parent  5305a665bdd48fa7c339ba0123f775202a108b07# Parent  683523db4fe83ecbd18881df1f7802fbb21311d5
Merge 0.7->0.8

diff -r 5305a665bdd4 -r 67ce42aa7419 util/xmppstream.lua