From: Joey Hess <joey@kitenet.net>
Date: Fri, 3 Jun 2011 15:29:26 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/a42bbcb875aeb1e6715842cdb926952e18a3e439?hp=-c

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

a42bbcb875aeb1e6715842cdb926952e18a3e439