From: Joey Hess <joey@kodama.kitenet.net>
Date: Mon, 11 Feb 2008 03:54:17 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/ccc5b496e34a58a834a4402586958659c7d4e40f?hp=ccc5b496e34a58a834a4402586958659c7d4e40f

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