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)
commitac8c3154923599cf1226ae4d7ea5a6ab0d473ea5
tree46c8b86e8cd226433bd5b1ae33b45efd79b596dd
parent6a530b77c5ddb807e7bb1f60ec54f9d36f74313e
parent6f113f5435ec450a7e4862186e6278d9746cfb30
Merge 0.9->0.10
util/jid.lua