From: Zak Rogoff <atticus@Amdijefri.office.fsf.org>
Date: Tue, 16 Sep 2014 16:20:13 +0000 (-0400)
Subject: Merge branch 'master' into stable
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=a088f91ec81a9e2e96ea89b4563bddac49815753;p=libreplanet-static.git

Merge branch 'master' into stable
---

a088f91ec81a9e2e96ea89b4563bddac49815753