From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 15 Aug 2009 20:34:20 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.1415926~117
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ac253566aeea1f0afe6db498c92853ada6581e51;p=ikiwiki.git

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

ac253566aeea1f0afe6db498c92853ada6581e51