Merge branch 'release/0.8.5' into develop

HISTORY.rst

@@ -1,6 +1,13 @@
 History
 =======
 
+0.8.5 (2010-10-06)
+------------------
+
+* New import system. All dependencies attempt to load from site-packages,
+  then fallback on vendorized modules.
+
+
 0.8.4 (2010-10-04)
 ------------------
 

setup.py

@@ -22,7 +22,7 @@ required = []
 
 setup(
 	name='tablib',
-	version='0.8.4',
+	version='0.8.5',
 	description='Format agnostic tabular data library (XLS, JSON, YAML, CSV)',
 	long_description=open('README.rst').read() + '\n\n' +
 	                 open('HISTORY.rst').read(),

tablib/core.py

@@ -13,8 +13,8 @@ from tablib.formats import FORMATS as formats
 
 
 __title__ = 'tablib'
-__version__ = '0.8.4'
-__build__ = 0x000804
+__version__ = '0.8.5'
+__build__ = 0x000805
 __author__ = 'Kenneth Reitz'
 __license__ = 'MIT'
 __copyright__ = 'Copyright 2010 Kenneth Reitz'