From: Zak Rogoff <zak@montage.office.fsf.org>
Date: Wed, 18 Feb 2015 22:10:16 +0000 (-0500)
Subject: Merge branch 'master' into stable
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=205a3f98e2b4529d7bb9fa420cd9754aed0091b6;p=libreplanet-static.git

Merge branch 'master' into stable
---

205a3f98e2b4529d7bb9fa420cd9754aed0091b6