Merge branch 'stable'
authorZak Rogoff <zak@montage.office.fsf.org>
Mon, 10 Nov 2014 22:25:38 +0000 (17:25 -0500)
committerZak Rogoff <zak@montage.office.fsf.org>
Mon, 10 Nov 2014 22:25:38 +0000 (17:25 -0500)
commit4a6fbc27896ac9e7751481fd9927abc3aa8a2351
tree3995da788f940dd7cdb3788b4af057eb0e8a54be
parentaadfe343ae50705a31a807e41994ed8d2047c537
parent65f00ebded6542ec98d5be44a2e69dbda10b7c2e
Merge branch 'stable'