comparison util/xmppstream.lua @ 6354:bbb4a82db32e

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Wed, 13 Aug 2014 19:22:08 +0200
parents 3c02a9ed399e
children c2d144d3f8dd
comparison
equal deleted inserted replaced
6349:0cee68dd35f8 6354:bbb4a82db32e