From: Zak Rogoff <zak@montage.office.fsf.org>
Date: Wed, 11 Feb 2015 18:05:17 +0000 (-0500)
Subject: Merge branch 'master' into stable
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=685801bf89a1665442881c8ab92a4fc222a8d8b9;p=libreplanet-static.git

Merge branch 'master' into stable
---

685801bf89a1665442881c8ab92a4fc222a8d8b9