Diff

plugins/muc/lock.lib.lua @ 6650:cf15b18e9810

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Tue, 05 May 2015 01:34:20 +0200
parent 6329:6b3eb1611587
child 7407:e465b584547b
line wrap: on
line diff