From: Zak Rogoff Date: Fri, 29 Jan 2016 21:29:43 +0000 (-0500) Subject: Merge branch 'master' into stable X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=ca00f7da23935fb5b4cf34db5c57fa54d66ed8a6;p=libreplanet-static.git Merge branch 'master' into stable --- ca00f7da23935fb5b4cf34db5c57fa54d66ed8a6