Merge branch 'azure' into azure-1.1

Conflicts:
	setup.py

Author: michiya

setup.py

@@ -19,7 +19,7 @@
 
 setup(
     name='django-pyodbc-azure',
-    version='1.1.3',
+    version='1.1.4',
     description='Django backend for MS SQL Server and Windows Azure SQL Database using pyodbc',
     long_description=open('README.rst').read(),
     author='Michiya Takahashi',