From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 11 Jan 2009 19:28:25 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.02~39
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5a847e638ceb5a0a8219ef65d31e7fb75d4f0a8e;p=ikiwiki.git

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

5a847e638ceb5a0a8219ef65d31e7fb75d4f0a8e