Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Mon, 12 Dec 2016 20:49:28 +0000 (15:49 -0500)
committerZak Rogoff <zak@fsf.org>
Mon, 12 Dec 2016 20:49:28 +0000 (15:49 -0500)
commit2b0178c392465f43fd9a8a235bb954952756ca1d
tree5e3fcfc2690a3c9e94f9726a9163cc385b79a18c
parentfc88f8dc4de7595f802ec0295fa8528accd7b0af
parent59f8380e19b09fde7a208be0f6a64949226fd6e5
Merge branch 'master' into stable