comparison plugins/muc/occupant.lib.lua @ 7107:e7d199c2a22d

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Wed, 27 Jan 2016 20:38:09 +0000
parents 6cc7c9da29ed
children 74b9e05af71e
comparison
equal deleted inserted replaced
7102:250016f5eb7e 7107:e7d199c2a22d