Merge 0.6->0.7

diff --cc core/configmanager.lua
Simple merge

diff --cc net/server_select.lua
Simple merge

diff --cc plugins/muc/muc.lib.lua
index 75289cc1584c88e061de22eb5e5e83da67d39c16,273e21ce94214b585d54580b60eb658b6d59f5af..18c80325bbd1bce5db492b36643407d4d1b4bf65
--- 1/plugins/muc/muc.lib.lua
--- 2/plugins/muc/muc.lib.lua
+++ b/plugins/muc/muc.lib.lua
@@@ -328,7 -357,7 +319,12 @@@ function room_mt:handle_to_occupant(ori
                                                                :tag("item", {affiliation=affiliation or "none", role=role or "none"}):up()
                                                                :tag("status", {code='110'}));
                                                end
 -                                              self:send_history(from, stanza);
++                                              if self._data.whois == 'anyone' then -- non-anonymous?
++                                                      self:_route_stanza(st.stanza("message", {from=to, to=from, type='groupchat'})
++                                                              :tag("x", {xmlns='http://jabber.org/protocol/muc#user'})
++                                                              :tag("status", {code='100'}));
++                                              end
 +                                              self:send_history(from);
                                        else -- banned
                                                local reply = st.error_reply(stanza, "auth", "forbidden"):up();
                                                reply.tags[1].attr.code = "403";

diff --cc prosody
index 0f705b62bc905cd4f1019b6cf049f7dede10f54c,8e96eb46ac88d1cfdc42bf146a0570928686bd17..c7f91456d7d66f3f27b7ad16e7591bc942a76d58
--- 1/prosody
--- 2/prosody
+++ b/prosody
@@@ -22,6 -22,6 +22,9 @@@ if CFG_SOURCEDIR the
        package.cpath = CFG_SOURCEDIR.."/?.so;"..package.cpath;
  end
  
++package.path = package.path..";"..(CFG_SOURCEDIR or ".").."/fallbacks/?.lua";
++package.cpath = package.cpath..";"..(CFG_SOURCEDIR or ".").."/fallbacks/?.so";
++
  -- Substitute ~ with path to home directory in data path
  if CFG_DATADIR then
        if os.getenv("HOME") then