Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Thu, 28 Jan 2016 22:43:44 +0000 (17:43 -0500)
committerZak Rogoff <zak@fsf.org>
Thu, 28 Jan 2016 22:43:44 +0000 (17:43 -0500)
commit39454d2f197b290c20f6f71172adde409c0dec0d
tree1fe48afdddb1f4ddb60e1edf92293b26a348044d
parent9f985671d5f4d0a990d538044abe4d7f8c951404
parent541ff9aed24733998c1335d8c41373b5f58e75fd
Merge branch 'master' into stable