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)
1  2 
util/xmppstream.lua

Simple merge