Comparison

plugins/muc/occupant.lib.lua @ 6977:450db0b83fe9

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 06 Dec 2015 02:43:01 +0100
parent 6271:006b0e0f0de2
child 7086:6cc7c9da29ed
comparison
equal deleted inserted replaced
6966:3e3a83be7e14 6977:450db0b83fe9