Merge branch 'stable' of vcs.fsf.org:libreplanet-static into stable
authorZak Rogoff <zak@fsf.org>
Mon, 26 Oct 2015 16:14:18 +0000 (12:14 -0400)
committerZak Rogoff <zak@fsf.org>
Mon, 26 Oct 2015 16:14:18 +0000 (12:14 -0400)

Trivial merge