Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Fri, 30 Oct 2015 13:55:48 +0000 (09:55 -0400)
committerZak Rogoff <zak@fsf.org>
Fri, 30 Oct 2015 13:55:48 +0000 (09:55 -0400)
commit8d8d26fe5828b9e7bd491d9d8ca3b97a3ab05ffc
tree7b779332167c65cd3765201a617501653f6d68fb
parent2d92dfac6d906468da5f24851b5df6d6058d2477
parent54b683c6016aad8193e36455dc2989c4975fa410
Merge branch 'master' into stable