From: Joey Hess <joey@kitenet.net>
Date: Mon, 3 May 2010 20:03:06 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20100504~17
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ae75c9bee683d5645b033ddea5b211cc99416d19;p=ikiwiki.git

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

ae75c9bee683d5645b033ddea5b211cc99416d19