From: Joey Hess <joey@kitenet.net>
Date: Wed, 23 Jun 2010 17:30:14 +0000 (-0400)
Subject: Merge remote branch 'remotes/bzed/extendedlink'
X-Git-Tag: 3.20100623~6
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=851712cb0ececf5f0396283aa7e908900bc2c194;p=ikiwiki.git

Merge remote branch 'remotes/bzed/extendedlink'
---

851712cb0ececf5f0396283aa7e908900bc2c194