From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 19 Mar 2010 17:39:51 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20100403~140
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a2e387d64be7c68400f5c80bcb7da973ed05fa3d;p=ikiwiki.git

Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
---

a2e387d64be7c68400f5c80bcb7da973ed05fa3d