From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 7 Apr 2010 02:50:19 +0000 (-0400)
Subject: Merge remote branch 'smcv/ready/link-types'
X-Git-Tag: 3.20100427~210
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f6fd7639daadea87530897ffd4882c970413822d;p=ikiwiki.git

Merge remote branch 'smcv/ready/link-types'
---

f6fd7639daadea87530897ffd4882c970413822d