net.server_epoll: Avoid concatenating buffer with single item Saves creating a string that'll be identical to buffer[1] anyways, as well as a C function call. Depending on Lua version and length of the string, this could be reusing an interned string, but a longer one would probably be duplicated for no reason. Having exactly one item in the buffer seems like it would be fairly common, but I have not done an extensive study. If opportunistic writes are enabled then it will be even more likely. This special case could be optimized like this in table.concat but it does not look like it is.

Merge 0.11->trunk

core.rostermanager: Cache rosters of offline users for faster access (fixes #1233) (grafted from 42a3e3a2824822cef7640ac56d182c59bdd4224e)

Merge 0.11->trunk

mod_mam: Fix rebase mistake [luacheck] The 'err' was there in trunk

mod_muc_mam: Fix rebase mistake [luacheck] The 'err' was there in trunk

mod_adhoc: Improve permission setting (fix #1482) BC Rename 'user' permission mode to 'any' for clarity, too easily mistaken for what the 'local_user' setting does. It is also removed as a default and made a required argument.

mod_storage_sql: Remove unused and not actually returned return value [luacheck] The :delete throws an error, it does not return one like this.

Merge 0.11->trunk

mod_muc_mam: Schedule cleanup again on failure