From: k054 <k@fsf.org>
Date: Fri, 18 Mar 2016 22:51:24 +0000 (-0400)
Subject: Merge branch 'master' into stable
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=a2eef357498bc39f2e36242960028dcbf9d0c489;p=libreplanet-static.git

Merge branch 'master' into stable
---

a2eef357498bc39f2e36242960028dcbf9d0c489