Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Thu, 25 Aug 2016 22:07:10 +0000 (18:07 -0400)
committerZak Rogoff <zak@fsf.org>
Thu, 25 Aug 2016 22:07:10 +0000 (18:07 -0400)
commit5d6e032953b11727a1445bdefc398e43271184bf
tree30754b28d35bebadf2c976851cc0d8fa713e1e52
parent814e18eb0e35616a011da71ffb2d0eed0bbaadfc
parentc60e323bc2d835fb2d12ba9d4c0c81740661905f
Merge branch 'master' into stable