From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 8 Oct 2009 17:56:54 +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/586c35de30781821050c6f3237da2340ca6a51b5?hp=586c35de30781821050c6f3237da2340ca6a51b5

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