Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Wed, 28 Sep 2016 15:54:28 +0000 (11:54 -0400)
committerZak Rogoff <zak@fsf.org>
Wed, 28 Sep 2016 15:54:28 +0000 (11:54 -0400)
commit0ad237e3eed2d9844aa5da6b67af83a7e9325af1
treef8673e5f51fe7cbbbe45e8f67f670dd28c8ab9db
parent7e982b44654ce97cff6fa353f966eb69c6657ad8
parent7116bc263f940681ee5a3fe7c640c0e10c8814df
Merge branch 'master' into stable