Comparison

plugins/muc/lock.lib.lua @ 6322:c3d750a43d8c

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 25 Jul 2014 21:16:52 +0200
parent 6242:67efeadd9e77
child 6329:6b3eb1611587
comparison
equal deleted inserted replaced
6318:e5e7a789ef55 6322:c3d750a43d8c