Merge branch 'master' of vcs.fsf.org:libreplanet-static
authorZak Rogoff <atticus@Amdijefri.office.fsf.org>
Thu, 19 Mar 2015 14:55:38 +0000 (10:55 -0400)
committerZak Rogoff <atticus@Amdijefri.office.fsf.org>
Thu, 19 Mar 2015 14:55:38 +0000 (10:55 -0400)

Trivial merge