Diff

plugins/muc/affiliation_notify.lib.lua @ 6418:ae798314347c

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 18 Sep 2014 02:22:48 +0200 (2014-09-18)
parent 6394:fe034fa564ee
child 6991:84e01dbb739e
line wrap: on
line diff