Merge branch 'stable'
authorZak Rogoff <zak@fsf.org>
Wed, 11 Jan 2017 17:11:00 +0000 (12:11 -0500)
committerZak Rogoff <zak@fsf.org>
Wed, 11 Jan 2017 17:11:00 +0000 (12:11 -0500)
commit5e815043b0835dd5e151569792c4852ee76cf720
tree03f0718688dd0eddb9ee43f248bd8113fc73201f
parent7755bbc0798e063c92c926ed8b3b4d16cc8f1df3
parent2b0178c392465f43fd9a8a235bb954952756ca1d
Merge branch 'stable'