Diff

util/xmppstream.lua @ 6511:5f9389af5115

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 09 Nov 2014 20:32:33 +0100 (2014-11-09)
parent 6367:769a3577dd85
child 6777:5de6b93d0190
line wrap: on
line diff