Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Wed, 7 Dec 2016 19:49:07 +0000 (14:49 -0500)
committerZak Rogoff <zak@fsf.org>
Wed, 7 Dec 2016 19:49:07 +0000 (14:49 -0500)
commit208e8b5197830864f17d36ad4329d5f7d8d63774
tree5d11b9d6e0ceb22f88758e37776d42af41da3d82
parentff1eb442d99e4628413bf977204d03b151da64f7
parent5bcdd45c49e777fcdd5658dae9acb529c3365fe3
Merge branch 'master' into stable