Diff

plugins/muc/description.lib.lua @ 6693:365f0f885aa5

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 14 May 2015 00:24:21 +0200 (2015-05-13)
parent 6204:c3254827698d
child 6991:84e01dbb739e
line wrap: on
line diff