Merge branch 'master' of vcs.fsf.org:libreplanet-static
authorZak Rogoff <zak@montage.office.fsf.org>
Fri, 10 Oct 2014 21:48:17 +0000 (17:48 -0400)
committerZak Rogoff <zak@montage.office.fsf.org>
Fri, 10 Oct 2014 21:48:17 +0000 (17:48 -0400)

Trivial merge