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

Merge branch 'master' into stable
---

6551985e3228e84297231c17ac1344e2509e1c59