diff options
author | Matthew Wild <mwild1@gmail.com> | 2014-04-21 17:42:44 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2014-04-21 17:42:44 +0100 |
commit | 36661ad7ac28934b50b14c82c89f2be126da34d4 (patch) | |
tree | f7defc7b0550e7d7faaa9142666b31076e77805f /plugins/muc/occupant.lib.lua | |
parent | 8750213c6c10a57b43d0951bf9fb6d2272d048c1 (diff) | |
parent | ac86f02f0d406d55445c6fd8f426fe7589301eef (diff) | |
download | prosody-36661ad7ac28934b50b14c82c89f2be126da34d4.tar.gz prosody-36661ad7ac28934b50b14c82c89f2be126da34d4.zip |
Merge daurnimator->trunk
Diffstat (limited to 'plugins/muc/occupant.lib.lua')
0 files changed, 0 insertions, 0 deletions