From: Joey Hess <joey@kodama.kitenet.net>
Date: Sun, 3 Aug 2008 18:23:38 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.60~106
X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=137624775407e433935f68b9ee282723adca1513

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

137624775407e433935f68b9ee282723adca1513