From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 5 Jan 2010 04:38:59 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20100122~59
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=51d401adc51074e9bfce0269d0be46bc4e295b59;p=ikiwiki.git

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

51d401adc51074e9bfce0269d0be46bc4e295b59