From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 14 Mar 2008 22:45:31 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
X-Git-Tag: 2.41~130
X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=44d4f086efcd5e777e100eeca078fc6eafaf9476

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

44d4f086efcd5e777e100eeca078fc6eafaf9476