Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Mon, 1 Feb 2016 21:56:22 +0000 (16:56 -0500)
committerZak Rogoff <zak@fsf.org>
Mon, 1 Feb 2016 21:56:22 +0000 (16:56 -0500)
commit20600a79455388cb363bc35fa557f2c7392cea1f
tree0144e4a2c0af15722ab885bfed336c4e27834d07
parentca00f7da23935fb5b4cf34db5c57fa54d66ed8a6
parentb0b9847238ea7286e22d5b14f4e9aa6a0a133527
Merge branch 'master' into stable