Merge branch 'master' into stable
authorZak Rogoff <zak@montage.office.fsf.org>
Thu, 5 Feb 2015 16:14:16 +0000 (11:14 -0500)
committerZak Rogoff <zak@montage.office.fsf.org>
Thu, 5 Feb 2015 16:14:16 +0000 (11:14 -0500)
commit514f5031edf7f37cac8db40f467ecf6b378973b2
treebe6de625db8ae31d68b9b7247ce23edbcc360158
parent61d5c4f04c3a0017f45d41cc4fcd7ca635645f95
parent5c5c9305943687a593f8c121c33f1f0c12d1e66e
Merge branch 'master' into stable