The merge adds chat history to the html5 jabber client using jio and localstorage. Since master on gitlab is behind master in git.erp5.org it also includes the changes done in https://git.erp5.org/gitweb/erp5.git/commit/647892460f3163cba8dbb301a189eb042b8a3348