core.moduleapi: Fix error context in :send_iq API It got passed as argument to reject() instead of the util.error function and was lost.

mod_http_errors: Use text from util.errror object if included This makes util.error objects useful for more than just an error code container.

util.pubsub: Ignore unused argument in tests [luacheck]

util.pubsub: Cover subscription filter in a partial test I'm not sure I understand spies well enough to test that the arguments and return values are as expected. Better than nothing at least.

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