Merge 0.8->trunk
authorMatthew Wild <mwild1@gmail.com>
Sun, 5 Jun 2011 00:54:06 +0000 (01:54 +0100)
committerMatthew Wild <mwild1@gmail.com>
Sun, 5 Jun 2011 00:54:06 +0000 (01:54 +0100)
commit0d3a399b188ac9981f47256bc500007fdcb2bf27
treeecca6710368f10feeb7638e1bb2fae242680669a
parent11d94e91c35260d787733614ca5fe46836a134ee
parentea1e4b31330ba5c043084ef4afbcdf5fa26986be
Merge 0.8->trunk
util/xmppstream.lua