Merge tag 'v0.9.1' into releases

* tag 'v0.9.1':
  Set version to 0.9.1.
  Add missing files to MANIFEST for sdist upload.
  Update manifest not to include gh-pages in docs.
  Get rid of that inherited 's' once and for all.

MANIFEST.in

@@ -3,7 +3,7 @@ include setup*.py
 include MANIFEST.in
 include *.txt
 include Makefile
-recursive-include skimage *.pyx *.pxd *.pxi *.py *.c *.h *.ini *.md5
+recursive-include skimage *.pyx *.pxd *.pxi *.py *.c *.h *.ini *.md5 *.rst *.txt
 recursive-include skimage/data *
 
 include doc/Makefile
@@ -12,3 +12,4 @@ recursive-include doc/tools *.txt
 recursive-include doc/source/_templates *.html
 recursive-include doc *.py
 prune doc/build
+prune doc/gh-pages

bento.info

@@ -1,5 +1,5 @@
 Name: scikit-image
-Version: 0.9.0
+Version: 0.9.1
 Summary: Image processing routines for SciPy
 Url: http://scikit-image.org
 DownloadUrl: http://github.com/scikit-image/scikit-image

doc/release/release_0.9.txt

@@ -1,5 +1,5 @@
-Announcement: scikits-image 0.9.0
-=================================
+Announcement: scikit-image 0.9.0
+================================
 
 We're happy to announce the release of scikit-image v0.9.0!
 

setup.py

@@ -17,7 +17,7 @@ MAINTAINER_EMAIL    = 'stefan@sun.ac.za'
 URL                 = 'http://scikit-image.org'
 LICENSE             = 'Modified BSD'
 DOWNLOAD_URL        = 'http://github.com/scikit-image/scikit-image'
-VERSION             = '0.9.0'
+VERSION             = '0.9.1'
 PYTHON_VERSION      = (2, 5)
 DEPENDENCIES        = {
                         'numpy': (1, 6),