From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 16 Dec 2015 22:27:22 +0000 (+0000)
Subject: Merge branch 'anarres-vanilla'
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=5f7cd9911c34368127da9819a3afc878976c02e5;p=ian-dotfiles.git

Merge branch 'anarres-vanilla'

-s ours (ie, discard those changes)
---

5f7cd9911c34368127da9819a3afc878976c02e5