diff plugins/muc/lock.lib.lua @ 6428:3ee09bfe16e1

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Tue, 23 Sep 2014 23:22:13 +0200
parents 6b3eb1611587
children e465b584547b
line wrap: on
line diff