Comparison

plugins/muc/occupant.lib.lua @ 7989:5632aa85e0b6

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Mon, 20 Mar 2017 03:11:27 +0100
parent 7086:6cc7c9da29ed
child 12977:74b9e05af71e
comparison
equal deleted inserted replaced
7986:522099269b49 7989:5632aa85e0b6