From: k054 <k@fsf.org>
Date: Sat, 19 Mar 2016 12:12:38 +0000 (-0400)
Subject: Merge branch 'master' into stable
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=49ed72bd116285571b77321f94ee81fff2fa9af4;p=libreplanet-static.git

Merge branch 'master' into stable
---

49ed72bd116285571b77321f94ee81fff2fa9af4