From: Joey Hess <joey@kodama.kitenet.net>
Date: Sun, 15 Jun 2008 21:33:41 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.51~79
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=eab612e3d424f272db5aa4a3352396e88dbbc35a;p=ikiwiki.git

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

eab612e3d424f272db5aa4a3352396e88dbbc35a