# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1384022233 0
# Node ID 91b48772b27b768d0afd208cb0bca7ccee6542b2
# Parent  cb1103423aa750ebebcfb4fc61f4222b7ee7ab54# Parent  c1bc2c20a80a82498c3796421b6a3a3693045a7e
Merge 0.10->trunk

diff -r cb1103423aa7 -r 91b48772b27b core/certmanager.lua
--- a/core/certmanager.lua	Wed Nov 06 14:38:51 2013 -0500
+++ b/core/certmanager.lua	Sat Nov 09 18:37:13 2013 +0000
@@ -37,7 +37,7 @@
 	capath = "/etc/ssl/certs";
 	protocol = "sslv23";
 	verify = (ssl and ssl.x509 and { "peer", "client_once", }) or "none";
-	options = { "no_sslv2", "no_sslv3", luasec_has_noticket and "no_ticket" or nil };
+	options = { "no_sslv2", "no_sslv3", "cipher_server_preference", luasec_has_noticket and "no_ticket" or nil };
 	verifyext = { "lsec_continue", "lsec_ignore_purpose" };
 	curve = "secp384r1";
 	ciphers = "HIGH:!DSS:!aNULL@STRENGTH";
diff -r cb1103423aa7 -r 91b48772b27b plugins/mod_storage_sql2.lua
--- a/plugins/mod_storage_sql2.lua	Wed Nov 06 14:38:51 2013 -0500
+++ b/plugins/mod_storage_sql2.lua	Sat Nov 09 18:37:13 2013 +0000
@@ -239,7 +239,7 @@
 		if query.start then
 			where[#where] = "`when` BETWEEN ? AND ?" -- is this inclusive?
 		else
-			where[#where+1] = "`when` >= ?"
+			where[#where+1] = "`when` <= ?"
 		end
 	end