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

Merge branch 'master' into stable
---

0d310874b9f92a2357febb4ff6eb237ba439e81c