Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Thu, 25 Aug 2016 22:19:07 +0000 (18:19 -0400)
committerZak Rogoff <zak@fsf.org>
Thu, 25 Aug 2016 22:19:07 +0000 (18:19 -0400)
commita7e6b4c441cb8a08a3412c4426cf2af118724ff0
treeed3fa1e60bab64918821db7e3242ccf07799d460
parent5d6e032953b11727a1445bdefc398e43271184bf
parent106b8ad7727d788cd31cce00d87bc1c33e448f7d
Merge branch 'master' into stable