From: Joey Hess <joey@kitenet.net>
Date: Mon, 29 Nov 2010 18:43:57 +0000 (-0400)
Subject: Merge remote branch 'smcv/ready/localurl'
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0ae1e4cc0e598eacfeb508d11db81c33169631fd;p=ikiwiki.git

Merge remote branch 'smcv/ready/localurl'
---

0ae1e4cc0e598eacfeb508d11db81c33169631fd