Merge branch 'azure' into azure-1.1

Conflicts: setup.py
michiya · Jan 17, 2014 · e2e290b · e2e290b
2 parents 2359b43 + f4b325d
commit e2e290b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/setup.py b/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',