From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 25 Feb 2009 21:56:40 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.05~12
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d110235130d10e468fb7ef1a647831c866e954f1;p=ikiwiki.git

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

d110235130d10e468fb7ef1a647831c866e954f1