Merge 0.9->0.10
authorMatthew Wild <mwild1@gmail.com>
Wed, 16 Dec 2015 16:45:57 +0000 (16:45 +0000)
committerMatthew Wild <mwild1@gmail.com>
Wed, 16 Dec 2015 16:45:57 +0000 (16:45 +0000)
commit4a1c84c361e42ab8b1530e3e7427bf78d2384a2b
tree4a5cc8a22eef37663b515f15f3baff17e65ecb9b
parent9d596e90c68b187dfa803b9806ced7a5db91c6ef
parent57197982cae7d1ce94f7859c74c7ae18fd36fd54
Merge 0.9->0.10
plugins/muc/muc.lib.lua