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)

Trivial merge