From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 8 May 2008 19:51:41 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.46~15
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=879f3a9403ca92b50de08db21dd9c337d4c583f3;p=ikiwiki.git

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

879f3a9403ca92b50de08db21dd9c337d4c583f3