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

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

d17e1d8c9d124cbf92f356871124ff76ff88621a