From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 12 May 2009 17:30:54 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.13~135
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0162d9f614a4ccd79db89aa1a5a3453089df0680;p=ikiwiki.git

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

0162d9f614a4ccd79db89aa1a5a3453089df0680