Merge branch 'master' of github.com:pydanny/cached-property
authorAudrey Roy Greenfeld <aroy@alum.mit.edu>
Wed, 25 Nov 2015 01:38:40 +0000 (17:38 -0800)
committerAudrey Roy Greenfeld <aroy@alum.mit.edu>
Wed, 25 Nov 2015 01:38:40 +0000 (17:38 -0800)

Trivial merge