comparison plugins/muc/muc.lib.lua @ 6843:161cccfdf015

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Tue, 22 Sep 2015 01:31:52 +0200
parents 3afb8aa78069
children 494938dec5d8
comparison
equal deleted inserted replaced
6839:298182fd2387 6843:161cccfdf015