Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Mon, 1 Feb 2016 21:58:43 +0000 (16:58 -0500)
committerZak Rogoff <zak@fsf.org>
Mon, 1 Feb 2016 21:58:43 +0000 (16:58 -0500)
commitb60ad649f4727b4537e5c3cf5b5d74161fd9303c
tree1e2cbb3ebab2b852ade635a6a938f6ee80fd2b16
parent20600a79455388cb363bc35fa557f2c7392cea1f
parent19e7282971f462b6eb385c473b85a0cea90706ac
Merge branch 'master' into stable