Merge branch 'azure-1.1' into azure-1.2

Conflicts: setup.py
michiya · Oct 7, 2014 · f4b241b · f4b241b
2 parents 2b96200 + 78321b9
commit f4b241b
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.2.0',
+    version='1.2.1',
     description='Django backend for Microsoft SQL Server and Azure SQL Database using pyodbc',
     long_description=open('README.rst').read(),
     author='Michiya Takahashi',