Merge branch 'master' into stable
authorZak Rogoff <zak@montage.office.fsf.org>
Wed, 4 Feb 2015 22:30:41 +0000 (17:30 -0500)
committerZak Rogoff <zak@montage.office.fsf.org>
Wed, 4 Feb 2015 22:30:41 +0000 (17:30 -0500)
commit61d5c4f04c3a0017f45d41cc4fcd7ca635645f95
treeafc81ecb07f5777026602a789de24ea720c8d710
parent36fcf0934a8bec4b96b83c9f36f48f603ede21f8
parentea9ba10e3cc6e0441655d1476fe1d0c18d4a3984
Merge branch 'master' into stable