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

Merge branch 'master' into stable
---

61d5c4f04c3a0017f45d41cc4fcd7ca635645f95