From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 13 Oct 2009 19:07:48 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/f6402d22caeecf481826b60791d84cb53210f686?hp=-c;ds=sidebyside

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

f6402d22caeecf481826b60791d84cb53210f686