From: Joey Hess <joeyh@joeyh.name>
Date: Thu, 28 Apr 2016 23:06:01 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: 3.20160506~21
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/95c0a63675036b0f8bed7fd7a0d8485d4f605578

Merge remote-tracking branch 'origin/master'
---

95c0a63675036b0f8bed7fd7a0d8485d4f605578