From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 14 Mar 2010 17:16:12 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20100403~165
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c944bffe3dbad0746880a0cd573808f04505ebdd;p=ikiwiki.git

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

c944bffe3dbad0746880a0cd573808f04505ebdd