Comparison

plugins/muc/lock.lib.lua @ 7622:96e6df712359

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 20 Aug 2016 19:12:19 +0200
parent 7408:cf53081ce767
child 7999:980606856882
comparison
equal deleted inserted replaced
7619:f5016c8985d7 7622:96e6df712359