comparison plugins/muc/mod_muc.lua @ 5858:89b16a160cbc

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 06 Oct 2013 23:53:15 +0200
parents 026367992a0f
children 56d81af64fc5
comparison
equal deleted inserted replaced
5855:275d4da9404f 5858:89b16a160cbc