Merge 0.8->trunk
authorMatthew Wild <mwild1@gmail.com>
Wed, 1 Jun 2011 23:26:48 +0000 (00:26 +0100)
committerMatthew Wild <mwild1@gmail.com>
Wed, 1 Jun 2011 23:26:48 +0000 (00:26 +0100)
commit3eb2b3b4b2bb451b4f49c5fb0738837edfb835f3
tree7c9b71f0678e137ea81439c5e661deb80ef10cbe
parent8ee0370603ca03f15e7d3ea7242c6f1d9b9ef3a0
parent4f79d956eb0d29fde0f6516507e564ff7d020a77
Merge 0.8->trunk
util/xmppstream.lua