From: Zak Rogoff <zak@fsf.org>
Date: Tue, 29 Nov 2016 20:41:57 +0000 (-0500)
Subject: Merge branch 'master' into stable
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=30bf5638b707c835d977b8edb11ef2f80c4e5e6d;p=libreplanet-static.git

Merge branch 'master' into stable
---

30bf5638b707c835d977b8edb11ef2f80c4e5e6d