From: Simon McVittie <smcv@debian.org>
Date: Mon, 15 Sep 2014 20:39:18 +0000 (+0100)
Subject: Merge branch 'master' of ssh://ikiwiki.branchable.com
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/a1614ba8c5397a7342cc72cbd104db00122662e5?hp=--cc

Merge branch 'master' of ssh://ikiwiki.branchable.com
---

a1614ba8c5397a7342cc72cbd104db00122662e5