From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 5 May 2009 17:57:00 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.12~14
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=72736b5e727a88284d2d021b479a557a99d4b8c0;p=ikiwiki.git

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

72736b5e727a88284d2d021b479a557a99d4b8c0