Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Mon, 14 Mar 2016 16:19:37 +0000 (12:19 -0400)
committerZak Rogoff <zak@fsf.org>
Mon, 14 Mar 2016 16:19:37 +0000 (12:19 -0400)
commit4413678455ddaa8b6c87be6368a5c86e37608240
treea5e1d889baf69ebd8aa8570d72f5816e52d55128
parenteaf67c6c4a7d91cd095865cc9dbef17c0041860f
parent026b9f62c4302a2f620a126dc1b33dc7711878fa
Merge branch 'master' into stable