comparison plugins/muc/lock.lib.lua @ 6347:e1a7ccd82fce

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 10 Aug 2014 10:31:18 +0200
parents 6b3eb1611587
children e465b584547b
comparison
equal deleted inserted replaced
6343:e6839156bb82 6347:e1a7ccd82fce