From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 23 Nov 2009 20:01:23 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20091202~43
X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=4c0c6a19b83459d0336bafecc0e6181729a7b729

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

Conflicts:
	doc/sandbox.mdwn
---

4c0c6a19b83459d0336bafecc0e6181729a7b729