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

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