Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Thu, 21 Apr 2016 20:59:20 +0000 (16:59 -0400)
committerZak Rogoff <zak@fsf.org>
Thu, 21 Apr 2016 20:59:20 +0000 (16:59 -0400)
commit15a9221cbf07d38d23cd7212e841fb0e3cfdfc0a
tree5a5e8cf523aa07a1bace576c9fee30b8b36292b5
parent61f303b0e54809347b1a26042e2ff6108458af9e
parentb0af52593f82ba68444515f058dbae223911276f
Merge branch 'master' into stable