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

Merge branch 'master' into stable
---

7d7f80cb661adeb7e2d3b8b3a61c3b34b657dd0e