From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 9 Mar 2009 18:29:06 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.08~8
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f24904b160c76adf2fc079a8f1a7a1e5bd1628e5;p=ikiwiki.git

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

f24904b160c76adf2fc079a8f1a7a1e5bd1628e5