chiark / gitweb /
Merge branch 'anarres-vanilla'
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 16 Dec 2015 22:27:22 +0000 (22:27 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 16 Dec 2015 22:27:22 +0000 (22:27 +0000)
commit5f7cd9911c34368127da9819a3afc878976c02e5
tree5a96916f0c5a50c81dd658b19f97629bb9a611eb
parent4e4e713c4f08c2330fb1a6632663d07c5690b5a1
parent291472644747172076e1bb8db94154b9fa54315d
Merge branch 'anarres-vanilla'

-s ours (ie, discard those changes)