Merge branch 'master' of github.com:pinterest/pymemcache into add_hashing_client

Conflicts:
	setup.py

1 files changed, 9 insertions, 1 deletions

diff --git a/setup.py b/setup.py
index 9183a9d..55eb27b 100644
--- a/setup.py
+++ b/setup.py
@@ -1,9 +1,17 @@
 #!/usr/bin/env python
+import os
 
 from setuptools import setup, find_packages
 from pymemcache import __version__
 
 
+def read(fname):
+    return open(os.path.join(os.path.dirname(__file__), fname)).read()
+
+readme = read('README.md')
+changelog = read('ChangeLog.rst')
+
+
 setup(
     name='pymemcache',
     version=__version__,
@@ -12,7 +20,7 @@ setup(
     packages=find_packages(),
     install_requires=['six'],
     description='A comprehensive, fast, pure Python memcached client',
-    long_description=open('README.md').read(),
+    long_description=readme + '\n' + changelog,
     license='Apache License 2.0',
     url='https://github.com/Pinterest/pymemcache',
     classifiers=[