comparison plugins/muc/description.lib.lua @ 7892:f00943bbf84f

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Tue, 14 Feb 2017 23:42:11 +0100
parents e16b3fd0bd80
children 6dd7fea941f6
comparison
equal deleted inserted replaced
7887:93fd15b5ec1b 7892:f00943bbf84f