From: Joey Hess <joey@kitenet.net>
Date: Fri, 8 Oct 2010 23:32:20 +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/726270ad0017cfd1d1c36e9a765eb0638bec86f6?hp=726270ad0017cfd1d1c36e9a765eb0638bec86f6

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