Merge with 0.5

diff --cc net/server.lua
Simple merge

diff --cc plugins/mod_bosh.lua
index 4289628fc643ecf3a3c1d429b69566723be2b4c2,e310be28530833b8396dd29f4929c9b4213cc7bf..0dd4a192bfb266ead22fb21f10eab60a24b0270e
--- 1/plugins/mod_bosh.lua
--- 2/plugins/mod_bosh.lua
+++ b/plugins/mod_bosh.lua
@@@ -276,15 -286,9 +289,15 @@@ function on_timer(
                        inactive_sessions[session] = nil;
                end
        end
 +
 +      for i=1,n_dead_sessions do
 +              local session = dead_sessions[i];
 +              dead_sessions[i] = nil;
 +              sm_destroy_session(session, "BOSH client silent for over "..session.bosh_max_inactive.." seconds");
 +      end
  end
  
- local ports = config.get(module.host, "core", "bosh_ports") or { 5280 };
+ local ports = module:get_option("bosh_ports") or { 5280 };
  httpserver.new_from_config(ports, "http-bind", handle_request);
  
  server.addtimer(on_timer);