comparison plugins/muc/lock.lib.lua @ 6727:eb9c842b80fa

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Tue, 19 May 2015 23:23:44 +0200
parents 6b3eb1611587
children e465b584547b
comparison
equal deleted inserted replaced
6723:fb25dce69d41 6727:eb9c842b80fa