From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 2 Dec 2009 18:16:51 +0000 (-0500)
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/b74dceb884a60f6f7be395378a009ee414726d0b?hp=b74dceb884a60f6f7be395378a009ee414726d0b

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