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

Merge branch 'master' into stable
---

ff38657dc8d7d2089de8674419fe7b463a56c315