# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1381440421 -3600
# Node ID 10a16fdebe2cc217bc83d030fb921fe75365a772
# Parent  c3ee62b3bdfee3abcde9240acd38f6c2df7fb8d8# Parent  b10ee87ac76afed8564042481c3bee92072e760b
Merge 0.10->trunk

diff -r c3ee62b3bdfe -r 10a16fdebe2c util-src/windows.c
--- a/util-src/windows.c	Mon Oct 07 12:56:53 2013 +0200
+++ b/util-src/windows.c	Thu Oct 10 22:27:01 2013 +0100
@@ -58,7 +58,7 @@
 	
 	if (console == INVALID_HANDLE_VALUE) return lerror(L, "GetStdHandle");
 	if (!GetConsoleScreenBufferInfo(console, &info)) return lerror(L, "GetConsoleScreenBufferInfo");
-	if (!ReadConsoleOutputAttribute(console, &color, sizeof(WORD), info.dwCursorPosition, &read_len)) return lerror(L, "ReadConsoleOutputAttribute");
+	if (!ReadConsoleOutputAttribute(console, &color, 1, info.dwCursorPosition, &read_len)) return lerror(L, "ReadConsoleOutputAttribute");
 
 	lua_pushnumber(L, color);
 	return 1;
diff -r c3ee62b3bdfe -r 10a16fdebe2c util/sasl.lua
--- a/util/sasl.lua	Mon Oct 07 12:56:53 2013 +0200
+++ b/util/sasl.lua	Thu Oct 10 22:27:01 2013 +0100
@@ -18,7 +18,6 @@
 local setmetatable = setmetatable;
 local assert = assert;
 local require = require;
-local print = print
 
 module "sasl"
 
@@ -48,7 +47,7 @@
 local mechanism_channelbindings = {};
 
 -- register a new SASL mechanims
-local function registerMechanism(name, backends, f, cb_backends)
+function registerMechanism(name, backends, f, cb_backends)
 	assert(type(name) == "string", "Parameter name MUST be a string.");
 	assert(type(backends) == "string" or type(backends) == "table", "Parameter backends MUST be either a string or a table.");
 	assert(type(f) == "function", "Parameter f MUST be a function.");