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

Merge branch 'master' into stable
---

260f7352650bc4741fc54116f57b49a593a53318