# HG changeset patch
# User Waqas Hussain <waqas20@gmail.com>
# Date 1354511074 -18000
# Node ID ba51d0917c64f710dd27aa4a48ca7904589b58e2
# Parent  115cf8252be82836b017ee9a9f45c37187966f87# Parent  76e4651142e19b66737db63a85c56a9e004736f2
Merge 0.9->trunk.

diff -r 115cf8252be8 -r ba51d0917c64 net/http/parser.lua
--- a/net/http/parser.lua	Mon Dec 03 06:07:00 2012 +0500
+++ b/net/http/parser.lua	Mon Dec 03 10:04:34 2012 +0500
@@ -5,7 +5,7 @@
 local urldecode = require "net.http".urldecode;
 
 local function preprocess_path(path)
-	path = urldecode((path:gsub("//+". "/")));
+	path = urldecode((path:gsub("//+", "/")));
 	if path:sub(1,1) ~= "/" then
 		path = "/"..path;
 	end
diff -r 115cf8252be8 -r ba51d0917c64 util/xml.lua
--- a/util/xml.lua	Mon Dec 03 06:07:00 2012 +0500
+++ b/util/xml.lua	Mon Dec 03 10:04:34 2012 +0500
@@ -2,7 +2,7 @@
 local st = require "util.stanza";
 local lxp = require "lxp";
 
-module("template")
+module("xml")
 
 local parse_xml = (function()
 	local ns_prefixes = {