From: Joey Hess <joey@kodama.kitenet.net>
Date: Mon, 11 Aug 2008 16:47:51 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.60~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=49d56c3957668e54b4eb475f195ab019adffae40;p=ikiwiki.git

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

49d56c3957668e54b4eb475f195ab019adffae40