From: Daniel Roy Greenfeld <pydanny@users.noreply.github.com>
Date: Thu, 14 Jun 2018 16:29:45 +0000 (-0700)
Subject: Merge branch 'master' into pyup-update-wheel-0.30.0-to-0.31.1
X-Git-Tag: 1.4.3~4^2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=refs%2Fheads%2Fpyup-update-wheel-0.30.0-to-0.31.1;p=cached-property.git

Merge branch 'master' into pyup-update-wheel-0.30.0-to-0.31.1
---

4764abb13549d4c2e7c47f11788caa2eeb1eb9ff