From: Joey Hess <joey@kodama.kitenet.net>
Date: Tue, 29 Apr 2008 21:16:59 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.45~21
X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=9acb8151ccb8fa1ef7a769a2bb941066053cc736

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

9acb8151ccb8fa1ef7a769a2bb941066053cc736