Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Wed, 27 Jan 2016 23:00:36 +0000 (18:00 -0500)
committerZak Rogoff <zak@fsf.org>
Wed, 27 Jan 2016 23:00:36 +0000 (18:00 -0500)
commit0950ff90bd869c485c8a16fd24aa5b3804baabe2
treed403c65813098aa87445d32afd8e6b38ea97c558
parent14bd906bd591336cea9613f04816eabc8e20e0f7
parentdc2d0a66ef902c1e2889eae844b1d1218eeb4a89
Merge branch 'master' into stable