From: Zak Rogoff <zak@fsf.org>
Date: Mon, 1 Feb 2016 21:56:22 +0000 (-0500)
Subject: Merge branch 'master' into stable
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=20600a79455388cb363bc35fa557f2c7392cea1f;p=libreplanet-static.git

Merge branch 'master' into stable
---

20600a79455388cb363bc35fa557f2c7392cea1f