Merge branch 'master' into stable
authorZak Rogoff <zak@montage.office.fsf.org>
Wed, 11 Feb 2015 18:05:17 +0000 (13:05 -0500)
committerZak Rogoff <zak@montage.office.fsf.org>
Wed, 11 Feb 2015 18:05:17 +0000 (13:05 -0500)
commit685801bf89a1665442881c8ab92a4fc222a8d8b9
tree63c5368c1f19147727517e1f34511cadf952af15
parent514f5031edf7f37cac8db40f467ecf6b378973b2
parent286e2076cd8a443e04f19d463355bbc51a757982
Merge branch 'master' into stable