Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Fri, 4 Dec 2015 22:49:28 +0000 (17:49 -0500)
committerZak Rogoff <zak@fsf.org>
Fri, 4 Dec 2015 22:49:28 +0000 (17:49 -0500)
commit406e582aaa42a9679cbc0efce678a88d02ab58eb
treeec058d6a7e318c53cd62bab90c10f935c2d30863
parent27e4a03435251d15d90069d3dfbef343f3dad9b3
parent0d02bfa51251096eb045810c5f2430100fd37c74
Merge branch 'master' into stable