Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Fri, 18 Dec 2015 21:48:03 +0000 (16:48 -0500)
committerZak Rogoff <zak@fsf.org>
Fri, 18 Dec 2015 21:48:03 +0000 (16:48 -0500)
commit1aef936af5000bb8cc41a00506c89535addc75db
tree2b48c06e3c7d393039d5c8b56dce1309bd3efe84
parent406e582aaa42a9679cbc0efce678a88d02ab58eb
parent469354730f3fff93162c428d54f4f5dd32d33e63
Merge branch 'master' into stable