Diff

util/xmppstream.lua @ 7304:b6adb7c1a645

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 19 Mar 2016 22:46:41 +0100
parent 7240:bf8aa0d1951c
child 8382:e5d00bf4a4d5
line wrap: on
line diff