Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sat, 28 May 2016 10:51:12 +0000 (12:51 +0200)
committerKim Alvefur <zash@zash.se>
Sat, 28 May 2016 10:51:12 +0000 (12:51 +0200)
commit367213c4a9809120ba012f6a1d1c845dc183bfe5
tree01e7872decab2005296b0b8814489cf4f56e8ff1
parent8df2517bf2e7930e32ebf79a11b29206cb30782c
parent95cb46e9925fbe50a88d0e69292e79491c00de2f
Merge 0.10->trunk
plugins/muc/muc.lib.lua