# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1435251241 -7200
# Node ID 79318d5484658a4baafdc4d1b65ee9e3844770c1
# Parent  99b3f29c3c714a4d3caa029ae2c1634ce14fb2dc# Parent  adf2fdf1264a97ae5e1a8ec9c951774e255f91b2
Merge 0.9->0.10

diff -r 99b3f29c3c71 -r 79318d548465 plugins/muc/mod_muc.lua
--- a/plugins/muc/mod_muc.lua	Wed Jun 24 23:25:42 2015 +0100
+++ b/plugins/muc/mod_muc.lua	Thu Jun 25 18:54:01 2015 +0200
@@ -60,7 +60,7 @@
 	return _get_affiliation(self, jid);
 end
 function muclib.room_mt:set_affiliation(actor, jid, affiliation, callback, reason)
-	if is_admin(jid) then return nil, "modify", "not-acceptable"; end
+	if affiliation ~= "owner" and is_admin(jid) then return nil, "modify", "not-acceptable"; end
 	return _set_affiliation(self, actor, jid, affiliation, callback, reason);
 end