From: Joey Hess <joeyh@joeyh.name>
Date: Fri, 2 Jan 2015 20:44:23 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/2e2c3cd9e085aea93c379f37c4bfa4d740e954d2?hp=-c

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

2e2c3cd9e085aea93c379f37c4bfa4d740e954d2