comparison plugins/muc/occupant.lib.lua @ 7425:0bb98138dacf

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Thu, 12 May 2016 18:45:59 +0100
parents 6cc7c9da29ed
children 74b9e05af71e
comparison
equal deleted inserted replaced
7423:63141a85beea 7425:0bb98138dacf