Diff

util/xmppstream.lua @ 7286:30b9433a9f3e

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 17 Mar 2016 18:04:43 +0100
parent 7240:bf8aa0d1951c
child 8382:e5d00bf4a4d5
line wrap: on
line diff