Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Mon, 21 Dec 2015 20:58:33 +0000 (15:58 -0500)
committerZak Rogoff <zak@fsf.org>
Mon, 21 Dec 2015 20:58:33 +0000 (15:58 -0500)
commit33757d63a9933bdae2a0d7d3d0980a91f1783ddf
tree7e1a6bfdf47f8c4150caab1a68da37b19c6682fd
parent1aef936af5000bb8cc41a00506c89535addc75db
parent68ddc14a5598a17796bd1948c891b94ddc4a028a
Merge branch 'master' into stable