From: Joey Hess <joey@kodama.kitenet.net>
Date: Sat, 12 Jul 2008 00:43:52 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.54~135
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=27de4c050bee1eb0b164042bf8106a668c538049;p=ikiwiki.git

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

27de4c050bee1eb0b164042bf8106a668c538049