Merge branch 'release/2.3.6'

Author: ikirudennis

CHANGELOG.textile

@@ -1,5 +1,8 @@
 h1. Textile Changelog
 
+h2. Version 2.3.6
+* Packaging: @tests@ directory is correctly included in source-tarball. ("#33":https://github.com/textile/python-textile/issues/33)
+
 h2. Version 2.3.5
 * Bugfix: Correctly handle unicode text in url query-strings. ("#36":https://github.com/textile/python-textile/issues/36)
 
@@ -8,7 +11,7 @@ h2. Version 2.3.4
 * Remove misplaced shebang on non-callable files.
 * Packaging: Add test-command to setup.py directly.
 * Packaging: Included the tests/ directory for source-tarballs, useful for packaging checks. ("#33":https://github.com/textile/python-textile/issues/33)
-* Add a cli tool `pytextile` which takes textile input and prints html output.  See `pytextile -h` for details.
+* Add a cli tool @pytextile@ which takes textile input and prints html output.  See @pytextile -h@ for details.
 
 h2. Version 2.3.3
 * Bugfix: Unicode in URL titles no longer break everything ("#30":https://github.com/textile/python-textile/issues/30)

MANIFEST.in

@@ -9,3 +9,4 @@ include MANIFEST.in
 include pytest.ini
 include README.textile
 include requirements.txt
+recursive_include tests

textile/version.py

@@ -1 +1 @@
-VERSION = '2.3.5'
+VERSION = '2.3.6'