Comparison

plugins/muc/occupant.lib.lua @ 6603:e702ae7aa3d9

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Thu, 26 Mar 2015 16:49:03 +0000
parent 6271:006b0e0f0de2
child 7086:6cc7c9da29ed
comparison
equal deleted inserted replaced
6588:93423244dc5b 6603:e702ae7aa3d9