Merge branch 'master' into next

* master:
  Fix revenge and limit getting mixed up on save

src/mod/channels.mod/userchan.c

@@ -735,8 +735,8 @@ flood-exempt %d flood-lock-time %d knock %d fish-key { %s } \
 	chan->manop,
 	chan->mdop,
 	chan->mop,
-	chan->revenge,
         chan->limitraise,
+	chan->revenge,
         chan->ban_type,
 	chan->flood_pub_thr, chan->flood_pub_time,
 	chan->flood_bytes_thr, chan->flood_bytes_time,