Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Tue, 15 Mar 2016 21:15:36 +0000 (17:15 -0400)
committerZak Rogoff <zak@fsf.org>
Tue, 15 Mar 2016 21:15:36 +0000 (17:15 -0400)
commit468b21d0a4819c914ff73c7b0bebcd9c5bfb4a51
tree56058dafd6a39d246d55267354d41ed696c97d81
parentb999e3a266e45e2aa7a5ec0ee82fa4f651f690ef
parent8b6ad79502554ea734690344d4669d404094bbb3
Merge branch 'master' into stable