Comparison

plugins/muc/occupant.lib.lua @ 6690:b2e89583d6e6

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Wed, 13 May 2015 22:33:40 +0200
parent 6271:006b0e0f0de2
child 7086:6cc7c9da29ed
comparison
equal deleted inserted replaced
6679:96e034508978 6690:b2e89583d6e6