Merge branch 'master' of vcs.fsf.org:libreplanet-static
authorZak Rogoff <zak@fsf.org>
Mon, 8 Feb 2016 14:48:18 +0000 (09:48 -0500)
committerZak Rogoff <zak@fsf.org>
Mon, 8 Feb 2016 14:48:18 +0000 (09:48 -0500)

Trivial merge