From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 7 May 2008 21:06:12 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.46~33
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a7ece50826e68ef6fff2c541f4fa51ed25cba263;p=ikiwiki.git

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

a7ece50826e68ef6fff2c541f4fa51ed25cba263