Diff

util/xmppstream.lua @ 6258:8a01bce29834

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 24 May 2014 01:27:09 +0200 (2014-05-23)
parent 6084:3c02a9ed399e
child 6355:c2d144d3f8dd
line wrap: on
line diff