comparison plugins/muc/lock.lib.lua @ 7874:de3c6fb74759

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 28 Jan 2017 21:39:14 +0100
parents cf53081ce767
children 980606856882
comparison
equal deleted inserted replaced
7870:a858066faac6 7874:de3c6fb74759