From: Zak Rogoff <atticus@Amdijefri.office.fsf.org>
Date: Tue, 16 Sep 2014 16:00:01 +0000 (-0400)
Subject: Merge branch 'master' into stable
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=0f0d7beb63d20c13040ab0f5eefb837151fd4326;p=libreplanet-static.git

Merge branch 'master' into stable
---

0f0d7beb63d20c13040ab0f5eefb837151fd4326