Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Thu, 13 Oct 2016 15:38:42 +0000 (11:38 -0400)
committerZak Rogoff <zak@fsf.org>
Thu, 13 Oct 2016 15:38:42 +0000 (11:38 -0400)
commit624878e30ead653ee41203a28a210812834f7ada
tree68c1ab8c427cfcce014c9a7124c8996ac11bdf81
parentadb07a5d94fd3f0af297ad40c0af2694f22f4ee4
parentbc8154359a10ba9a524010915b3ea8e2557fec13
Merge branch 'master' into stable