comparison plugins/muc/lock.lib.lua @ 7900:41f783d4e127

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Wed, 15 Feb 2017 23:05:03 +0100
parents cf53081ce767
children 980606856882
comparison
equal deleted inserted replaced
7892:f00943bbf84f 7900:41f783d4e127