From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 20 Dec 2008 23:07:45 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.71~32
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5d5732d67313a66f8acbb9b78ca3ed97c636f61a;p=ikiwiki.git

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

5d5732d67313a66f8acbb9b78ca3ed97c636f61a