From: Zak Rogoff <zak@fsf.org>
Date: Wed, 20 Apr 2016 17:15:13 +0000 (-0400)
Subject: Merge branch 'master' into stable
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=61f303b0e54809347b1a26042e2ff6108458af9e;p=libreplanet-static.git

Merge branch 'master' into stable
---

61f303b0e54809347b1a26042e2ff6108458af9e