Diff

plugins/muc/occupant.lib.lua @ 6342:379faad8ce9f

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 09 Aug 2014 21:48:52 +0200 (2014-08-09)
parent 6271:006b0e0f0de2
child 7086:6cc7c9da29ed
line wrap: on
line diff