Comparison

plugins/muc/occupant.lib.lua @ 6871:e4b5885b7712

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 25 Sep 2015 18:11:45 +0200
parent 6271:006b0e0f0de2
child 7086:6cc7c9da29ed
comparison
equal deleted inserted replaced
6868:dcf9ceac9265 6871:e4b5885b7712