From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 12 Jun 2008 20:04:50 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.50~12
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=28aba38ed97fc779ce1c4139549e05b8336beaef;p=ikiwiki.git

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

28aba38ed97fc779ce1c4139549e05b8336beaef