From: Zak Rogoff <atticus@Amdijefri.office.fsf.org>
Date: Mon, 9 Mar 2015 14:27:50 +0000 (-0400)
Subject: Merge branch 'master' into stable
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=257d99643bb43f37386a010ed6ca56b10b308c1e;p=libreplanet-static.git

Merge branch 'master' into stable
---

257d99643bb43f37386a010ed6ca56b10b308c1e