From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 10 Sep 2009 20:17:58 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.14159265~72^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=59c88c255438fabe50115fbfa3adf1327579170d;p=ikiwiki.git

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

59c88c255438fabe50115fbfa3adf1327579170d