chiark / gitweb /
Merge remote branch 'origin/master'
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Mon, 6 Oct 2014 13:25:52 +0000 (14:25 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Mon, 6 Oct 2014 13:25:52 +0000 (14:25 +0100)
commitcb2220b4847b84df144c3b2b59d80b039c8b210b
treebc23b19bde54b7227f267385cfb985b63ed81ad9
parent52f7b207e0f61dfd4ee81f98edf5cf218e3e9e53
parent1c7e008cb6ba787ceebeef59ca547804f29d78b3
Merge remote branch 'origin/master'