Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Tue, 29 Nov 2016 20:41:57 +0000 (15:41 -0500)
committerZak Rogoff <zak@fsf.org>
Tue, 29 Nov 2016 20:41:57 +0000 (15:41 -0500)
commit30bf5638b707c835d977b8edb11ef2f80c4e5e6d
tree3a12444f8d27fd29658cf15b77227e0ef5f54c0a
parentc7a20ec2e8ef4c63d5596ba8cb0ac8e81319e007
parent60bc02024797f6e4d910d616bc6a74feb4c9fdbd
Merge branch 'master' into stable