From: Joey Hess <joey@kitenet.net>
Date: Fri, 18 Apr 2014 15:44:21 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/e7e20e8fd8126ca44de765ed20eb5e3d3fa935c8?hp=-c

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

e7e20e8fd8126ca44de765ed20eb5e3d3fa935c8