Comparison

plugins/muc/occupant.lib.lua @ 6418:ae798314347c

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 18 Sep 2014 02:22:48 +0200
parent 6271:006b0e0f0de2
child 7086:6cc7c9da29ed
comparison
equal deleted inserted replaced
6410:d782cbb46c2a 6418:ae798314347c