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)
commit35bd463e06881f0f6b2091a63582dbd1cf793459
tree31240a35d023481c8616fc106d5fa9a7d2debb9e
parentc06fc26ef10a72a8533f9b186452c8964caf5173
parent5941e2fe2b203b91f8baa439269838c0e2fa931b
Merge branch 'master' of vcs.fsf.org:libreplanet-static