From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 14 Feb 2008 20:42:50 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
X-Git-Tag: 2.40~86
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=841617c9ff35d25dd7a89f6905a67a911c22e430;p=ikiwiki.git

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

841617c9ff35d25dd7a89f6905a67a911c22e430