From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 17 Apr 2008 18:38:16 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.44~15
X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=81355cd4c6868358ea2828334406c9b6cd572b5f

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

81355cd4c6868358ea2828334406c9b6cd572b5f