Diff

util/xmppstream.lua @ 7036:f26debcae34e

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 27 Dec 2015 12:29:28 +0100
parent 6978:30c96a5db360
child 7240:bf8aa0d1951c
line wrap: on
line diff