Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Wed, 27 Jan 2016 20:32:01 +0000 (15:32 -0500)
committerZak Rogoff <zak@fsf.org>
Wed, 27 Jan 2016 20:32:01 +0000 (15:32 -0500)
commit14bd906bd591336cea9613f04816eabc8e20e0f7
treecbf0340023fbdc24b9bb37e5442a5902c480fa18
parent7884789ebf08bbdb401930d45ee38be3a7f31d67
parentbfc3114b58bfbb9bd43f1ca08722d4dfac3a0080
Merge branch 'master' into stable