Merge 0.8->trunk
authorMatthew Wild <mwild1@gmail.com>
Thu, 2 Jun 2011 14:28:41 +0000 (15:28 +0100)
committerMatthew Wild <mwild1@gmail.com>
Thu, 2 Jun 2011 14:28:41 +0000 (15:28 +0100)
commitcf7ed328796a60c28dfe88b1dd0485c0c5fb75f7
treeaffd5a16e7bbc69ef163c78a6902d8233babefc1
parentc269396a37a8bef1b71982f2cdd336324eb72d07
parente157cd13e86685e77c8ba0e9f4e97e729af8d821
Merge 0.8->trunk
util/xmppstream.lua