From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Wed, 22 Mar 2017 04:40:21 +0000 (+0100)
Subject: Merge branch 'master' of moltke.seatribe.se:/usr/local/src/wrw
X-Git-Url: http://dolda2000.com/gitweb/?p=wrw.git;a=commitdiff_plain;h=15dfd641773374daefdcffe73bc1b56b6bab0b7b;hp=0d77a23d34ff679933685321c82c159636b7abee

Merge branch 'master' of moltke.seatribe.se:/usr/local/src/wrw
---

diff --git a/wrw/proto.py b/wrw/proto.py
index 0e3c798..628bfc9 100644
--- a/wrw/proto.py
+++ b/wrw/proto.py
@@ -192,7 +192,7 @@ def parstring(pars={}, **augment):
 def parurl(url, pars={}, **augment):
     qs = parstring(pars, **augment)
     if qs != "":
-        return url + "?" + qs
+        return url + ("&" if "?" in url else "?") + qs
     else:
         return url