Comparison

plugins/muc/description.lib.lua @ 7338:f8d37227acd7

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Tue, 05 Apr 2016 20:54:43 +0200
parent 7124:a0764a8d6b26
child 7352:50b24b3476e6
comparison
equal deleted inserted replaced
7335:ab7e7d4fe9c1 7338:f8d37227acd7