From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 6 May 2009 03:26:15 +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/968598b1bb333cc617f03948239aa9cba60566c3?hp=968598b1bb333cc617f03948239aa9cba60566c3

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