From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 29 Jan 2009 19:45:58 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.03
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=451498e2a82d4b7a1fe5e4be6596a09b32a48132;p=ikiwiki.git

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

e37a0812b0dd88ae478fd5c28f4009e93709b31f