Diff

util/xmppstream.lua @ 5631:78bc91f0d74b

Merge 0.9->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 26 May 2013 22:59:06 +0200
parent 5311:86fe6e2fa5ae
child 5776:bd0ff8ae98a8
child 6042:1107d66d2ab2
line wrap: on
line diff