Comparison

plugins/muc/description.lib.lua @ 7120:a6afe52159f1

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Wed, 03 Feb 2016 02:13:03 +0100
parent 7119:50b9a7e86de9
child 7124:a0764a8d6b26
comparison
equal deleted inserted replaced
7119:50b9a7e86de9 7120:a6afe52159f1