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-Tag: 3.20101231~106
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/0ae1e4cc0e598eacfeb508d11db81c33169631fd?hp=0ae1e4cc0e598eacfeb508d11db81c33169631fd

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