From: Joey Hess <joey@kitenet.net>
Date: Sun, 26 Dec 2010 17:54:01 +0000 (-0400)
Subject: merge smcv/ready/urlto
X-Git-Tag: 3.20101231~27
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/171cdb69d3e3cc4d8b3023718a585092fb98dc05?ds=inline;hp=-c

merge smcv/ready/urlto
---

171cdb69d3e3cc4d8b3023718a585092fb98dc05
diff --git a/doc/bugs/urlto__40____34____34____44___...__44___1__41___not_absolute.mdwn b/doc/bugs/urlto__40____34____34____44___...__44___1__41___not_absolute.mdwn
index 73ffe3e16..8a93848b3 100644
--- a/doc/bugs/urlto__40____34____34____44___...__44___1__41___not_absolute.mdwn
+++ b/doc/bugs/urlto__40____34____34____44___...__44___1__41___not_absolute.mdwn
@@ -5,3 +5,5 @@ urlto() has a special-case for a zero-length first argument, but it
 produces a relative path even if the third argument is given and true.
 
 My `ready/urlto` branch simplifies this special case so it works. --[[smcv]]
+
+[[merged|done]] --[[Joey]]