Merge branch 'master' of vcs.fsf.org:libreplanet-static
authorZak Rogoff <zak@fsf.org>
Fri, 29 Jan 2016 21:27:29 +0000 (16:27 -0500)
committerZak Rogoff <zak@fsf.org>
Fri, 29 Jan 2016 21:27:29 +0000 (16:27 -0500)

Trivial merge