Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Tue, 24 Nov 2015 20:33:12 +0000 (15:33 -0500)
committerZak Rogoff <zak@fsf.org>
Tue, 24 Nov 2015 20:33:12 +0000 (15:33 -0500)
commit27e4a03435251d15d90069d3dfbef343f3dad9b3
tree7425b19058fad9a6350bbf94c2419d2d4014d4fd
parent2b46de3244d9b5376cadf2c193d3d97a362abbdf
parent0884e91686301ccc33f07135219667d070609208
Merge branch 'master' into stable