From: Joey Hess <joey@kitenet.net>
Date: Fri, 15 Aug 2014 16:54:30 +0000 (-0400)
Subject: Merge remote-tracking branch 'bremner/master'
X-Git-Tag: debian/3.20140815~5
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/a05eca45457efe7c31884a1b3c14ef2ff505f1d8?ds=sidebyside;hp=--cc

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

a05eca45457efe7c31884a1b3c14ef2ff505f1d8