Diff

plugins/muc/muc.lib.lua @ 6168:3942630b4e35

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 09 May 2014 23:35:54 +0200 (2014-05-09)
parent 6144:cb08bba0443a
child 6178:e12b13a46878
child 6232:d7dc71d9171d
line wrap: on
line diff