From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 18 May 2009 19:32:11 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.13~51
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d20030b62ac5c01cdbd793d3591398c0a1768373;p=ikiwiki.git

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

d20030b62ac5c01cdbd793d3591398c0a1768373