Merge branch 'stable' of vcs.fsf.org:libreplanet-static into stable
authorZak Rogoff <zak@fsf.org>
Fri, 10 Jan 2014 20:46:58 +0000 (15:46 -0500)
committerZak Rogoff <zak@fsf.org>
Fri, 10 Jan 2014 20:46:58 +0000 (15:46 -0500)

Trivial merge