Comparison

plugins/muc/occupant.lib.lua @ 7302:92d86016e1e3

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Fri, 18 Mar 2016 14:03:35 +0000
parent 7086:6cc7c9da29ed
child 12977:74b9e05af71e
comparison
equal deleted inserted replaced
7295:5f9c8204270f 7302:92d86016e1e3