Merge 0.7->0.8
authorMatthew Wild <mwild1@gmail.com>
Wed, 1 Jun 2011 23:26:23 +0000 (00:26 +0100)
committerMatthew Wild <mwild1@gmail.com>
Wed, 1 Jun 2011 23:26:23 +0000 (00:26 +0100)
commit8ee0370603ca03f15e7d3ea7242c6f1d9b9ef3a0
tree39860fa2e1f256bed981c1f74bb0e9a3be166a1f
parent093e7bb084c42c8ec56cc94bbd51cff25f94664a
parent9bc146b298d9b9e4fe8511bdb16518d1e671e760
Merge 0.7->0.8
util/xmppstream.lua