Diff

util/xmppstream.lua @ 7099:8e64e7b82928

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 22 Jan 2016 15:03:02 +0100
parent 6978:30c96a5db360
child 7240:bf8aa0d1951c
line wrap: on
line diff