# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1344612760 -3600
# Node ID d5bb9cd2e6dfa66484f6a74d7596bad9b6f95406
# Parent  71a5a6a6c74cad000d8fadfd3c13759264d7fd6a# Parent  1ef9aa0c9fb0abbe3e7d8ed19adb7dabbd79724d
Merge 0.9->trunk

diff -r 1ef9aa0c9fb0 -r d5bb9cd2e6df core/portmanager.lua
--- a/core/portmanager.lua	Thu Aug 09 07:17:25 2012 +0500
+++ b/core/portmanager.lua	Fri Aug 10 16:32:40 2012 +0100
@@ -82,7 +82,7 @@
 
 	local bind_interfaces = config.get("*", config_prefix.."interfaces")
 		or config.get("*", config_prefix.."interface") -- COMPAT w/pre-0.9
-		or (service_info.private and default_local_interfaces)
+		or (service_info.private and (config.get("*", "local_interfaces") or default_local_interfaces))
 		or config.get("*", "interfaces")
 		or config.get("*", "interface") -- COMPAT w/pre-0.9
 		or listener.default_interface -- COMPAT w/pre0.9