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

Merge branch 'master' into stable
---

4b6712fc2b4f331431f4795b403e76df9b664b5e