From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 12 Dec 2009 20:48:09 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20091218~13
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4b276377915198112856929c37d16697cbb7aaf3;p=ikiwiki.git

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

4b276377915198112856929c37d16697cbb7aaf3