Diff

plugins/muc/affiliation_notify.lib.lua @ 6465:ab68bb837fe0

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 05 Oct 2014 15:37:46 +0200 (2014-10-05)
parent 6394:fe034fa564ee
child 6991:84e01dbb739e
line wrap: on
line diff