Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Sat, 12 Mar 2016 01:18:36 +0000 (20:18 -0500)
committerZak Rogoff <zak@fsf.org>
Sat, 12 Mar 2016 01:18:36 +0000 (20:18 -0500)
commiteaf67c6c4a7d91cd095865cc9dbef17c0041860f
tree9aa21662a3cf542a6c2878bdd42b92f76819f48b
parent9dbb0e2e800f9c6ff7b4f0fdcb90c80339d3dd27
parent23a76237ea8ba74dc4936b5d28bc3da1dabdf004
Merge branch 'master' into stable