Merge branch 'master' of github.com:zopefoundation/ZEO

.travis.yml

@@ -11,7 +11,9 @@ before_install:
     - sudo rm -rf /dev/shm
     - sudo ln -s /run/shm /dev/shm
 install:
-    - python bootstrap.py
+    - virtualenv env
+    - env/bin/pip install -U setuptools distribute
+    - env/bin/python bootstrap.py
     - bin/buildout
 script:
     - bin/test -v1 -j99

CHANGES.txt → CHANGES.rst

-CHANGES
-=======
+Changelog
+=========
 
 4.0.0 (2013-08-18)
 ------------------

setup.py

@@ -94,9 +94,9 @@ def alltests():
 tests_require = ['zope.testing', 'manuel', 'random2']
 
 long_description = (
-    open('README.txt').read()
+    open('README.rst').read()
     + '\n' +
-    open('CHANGES.txt').read()
+    open('CHANGES.rst').read()
     )
 setup(name="ZEO",
       version=version,