From 65634d4b5f285dc728fcb44f0ad6d85a4ff02071 Mon Sep 17 00:00:00 2001
From: Oskar Arvidsson <oskar@irock.se>
Date: Thu, 19 Mar 2015 17:24:01 +0100
Subject: [PATCH 1/2] Don't decode query parameters when copying it to uri

---
 third_party/closure/goog/uri/uri.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/third_party/closure/goog/uri/uri.js b/third_party/closure/goog/uri/uri.js
index 130136e1e9..9d445100c5 100644
--- a/third_party/closure/goog/uri/uri.js
+++ b/third_party/closure/goog/uri/uri.js
@@ -277,7 +277,7 @@ goog.Uri.prototype.resolve = function(relativeUri) {
   }
 
   if (overridden) {
-    absoluteUri.setQueryData(relativeUri.getDecodedQuery());
+    absoluteUri.setQueryData(relativeUri.getQueryData().clone());
   } else {
     overridden = relativeUri.hasFragment();
   }

From c3bf78e8b667c31f1dda4d3e457740c5de8c0a9c Mon Sep 17 00:00:00 2001
From: Oskar Arvidsson <oskar@irock.se>
Date: Thu, 19 Mar 2015 17:25:08 +0100
Subject: [PATCH 2/2] Add Oskar Arvidsson to contributors

---
 AUTHORS      | 1 +
 CONTRIBUTORS | 1 +
 2 files changed, 2 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index 67ce9af473..f4233bd03b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -15,4 +15,5 @@
 
 Google Inc. <*@google.com>
 Jason Palmer <jason@jason-palmer.com>
+Oskar Arvidsson <oskar@irock.se>
 Sanborn Hilland <sanbornh@rogers.com>
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index a9cf3bed9b..654397d560 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -25,6 +25,7 @@
 Jason Palmer <jason@jason-palmer.com>
 Joey Parrish <joeyparrish@google.com>
 Natalie Harris <natalieharris@google.com>
+Oskar Arvidsson <oskar@irock.se>
 Sanborn Hilland <sanbornh@rogers.com>
 Timothy Drews <tdrews@google.com>
 Vasanth Polipelli <vasanthap@google.com>