comparison plugins/muc/subject.lib.lua @ 7885:236b5a6154b2

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 04 Feb 2017 01:08:27 +0100
parents e16b3fd0bd80
children b6b1f0f9b381
comparison
equal deleted inserted replaced
7878:2fdb7b3648d8 7885:236b5a6154b2