From: Joey Hess <joeyh@joeyh.name>
Date: Fri, 2 Jan 2015 16:45:54 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20150107~7
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/bd8198fb77ed5cf77ddeb860ca1ac983bfaacbbd?ds=sidebyside;hp=bd8198fb77ed5cf77ddeb860ca1ac983bfaacbbd

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