Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Wed, 27 Jan 2016 23:08:51 +0000 (18:08 -0500)
committerZak Rogoff <zak@fsf.org>
Wed, 27 Jan 2016 23:08:51 +0000 (18:08 -0500)
commita655f5cf1d9b336c66a1d891247c532f373ecf5c
treea113eb93217ac21a6860e76b586a556a6e19dfbd
parent0950ff90bd869c485c8a16fd24aa5b3804baabe2
parentc1e9a7019f0dd8fdc3d9dcc816b34878a72ec8a1
Merge branch 'master' into stable