Merge branch 'master' into stable
authorZak Rogoff <zak@montage.office.fsf.org>
Wed, 18 Feb 2015 22:10:16 +0000 (17:10 -0500)
committerZak Rogoff <zak@montage.office.fsf.org>
Wed, 18 Feb 2015 22:10:16 +0000 (17:10 -0500)
commit205a3f98e2b4529d7bb9fa420cd9754aed0091b6
tree0939875235dd1b84a17d9568a17b9232117c5073
parent2715a8775ce1ac94b969a8bc6f65347287215589
parent472635b77289e22ff43d075e031df318aa053ee9
Merge branch 'master' into stable