Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Mon, 26 Sep 2016 21:59:33 +0000 (17:59 -0400)
committerZak Rogoff <zak@fsf.org>
Mon, 26 Sep 2016 21:59:33 +0000 (17:59 -0400)
commit7e982b44654ce97cff6fa353f966eb69c6657ad8
tree047e6098f0b4e2a06a09cccaeef7d6f3f54467a7
parentaf13dbcbfb65fb397569361209168f1f4e60981a
parent2ae4bd0df1887bd4b9e60f4c8d123d0e610c0a21
Merge branch 'master' into stable