From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 13 Jun 2016 11:42:49 +0000 (+0100)
Subject: Pseudo-merge of mariner/msriner
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=ccd715dc9c54c2aa715ca2fcde7add96197b3f1c;p=ian-dotfiles.git

Pseudo-merge of mariner/msriner

Drop everything we haven't explicitly committed
---

ccd715dc9c54c2aa715ca2fcde7add96197b3f1c