Diff

plugins/muc/lock.lib.lua @ 6693:365f0f885aa5

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 14 May 2015 00:24:21 +0200 (2015-05-13)
parent 6329:6b3eb1611587
child 7407:e465b584547b
line wrap: on
line diff