Merge 0.7->trunk

diff --cc core/sessionmanager.lua
index ac07a793af57a18eba947bea151a30507b9f346f,e1f1a80214e9540abcea1a17c023a8d49e0889f1..6376851533021b51b0a10b3f2730a8a41c3039a6
--- 1/core/sessionmanager.lua
--- 2/core/sessionmanager.lua
+++ b/core/sessionmanager.lua
@@@ -25,8 -25,8 +25,9 @@@ local rm_load_roster = require "core.ro
  local config_get = require "core.configmanager".get;
  local nameprep = require "util.encodings".stringprep.nameprep;
  local resourceprep = require "util.encodings".stringprep.resourceprep;
+ local nodeprep = require "util.encodings".stringprep.nodeprep;
  
 +local initialize_filters = require "util.filters".initialize;
  local fire_event = require "core.eventmanager".fire_event;
  local add_task = require "util.timer".add_task;
  local gettime = require "socket".gettime;

diff --cc plugins/mod_saslauth.lua
Simple merge