Merge 0.9->0.10
authorMatthew Wild <mwild1@gmail.com>
Mon, 16 Dec 2013 02:04:16 +0000 (02:04 +0000)
committerMatthew Wild <mwild1@gmail.com>
Mon, 16 Dec 2013 02:04:16 +0000 (02:04 +0000)
1  2 
util/jid.lua

diff --cc util/jid.lua
Simple merge