From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 2 Oct 2009 22:46:10 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20091009~57
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=82ae1372a451781097086c8041288caca16a8296;p=ikiwiki.git

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

82ae1372a451781097086c8041288caca16a8296