From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 15 Oct 2008 23:36:48 +0000 (-0400)
Subject: Merge branch 'master' into darcs
X-Git-Tag: 3.10~49^2~14
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1f7f5d5e0e21920c5f15290cd34594ad91077071;p=ikiwiki.git

Merge branch 'master' into darcs
---

1f7f5d5e0e21920c5f15290cd34594ad91077071