Comparison

plugins/muc/lock.lib.lua @ 7870:a858066faac6

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 27 Jan 2017 12:23:19 +0100
parent 7408:cf53081ce767
child 7999:980606856882
comparison
equal deleted inserted replaced
7868:11fcdef5022f 7870:a858066faac6