# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1279178876 -3600
# Node ID 395f692b3182f649616cebb6ded4ec7cfb0fde59
# Parent  7c87af1c9a6895e3af7dd1cad67d6e899fbe58a8# Parent  5b32e6f8439208bc4e5521fba565466a6a4f0d2a
Merge with backout

diff -r 7c87af1c9a68 -r 395f692b3182 core/certmanager.lua
--- a/core/certmanager.lua	Wed Jul 14 16:24:15 2010 +0100
+++ b/core/certmanager.lua	Thu Jul 15 08:27:56 2010 +0100
@@ -19,7 +19,7 @@
 module "certmanager"
 
 -- Global SSL options if not overridden per-host
-local default_ssl_config = configmanager.get("*", "core", "ssl") or {};
+local default_ssl_config = configmanager.get("*", "core", "ssl");
 local default_capath = "/etc/ssl/certs";
 
 function create_context(host, mode, config)