Merge branch 'master' of vcs.fsf.org:libreplanet-static
authorZak Rogoff <zak@fsf.org>
Tue, 26 Jan 2016 20:33:23 +0000 (15:33 -0500)
committerZak Rogoff <zak@fsf.org>
Tue, 26 Jan 2016 20:33:23 +0000 (15:33 -0500)

Trivial merge