From: Libby <libby@allium.(none)>
Date: Tue, 3 Mar 2015 16:36:04 +0000 (-0500)
Subject: Merge branch 'master' into stable
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=612830c131f860b4d0a6319adff5dd30df211f8d;p=libreplanet-static.git

Merge branch 'master' into stable
---

612830c131f860b4d0a6319adff5dd30df211f8d