Merge remote-tracking branch 'upstream/master'

glynos · glynos · commit ff5f714562fd · 2014-12-19T14:58:01.000+01:00
diff --git a/uri b/uri
@@ -1 +1 @@
-Subproject commit 9567e16a5936bf0ebcea8b33d56863251dc94e9b
+Subproject commit de3ac1491e3b66392f6a771a478935155e25f01e
