Merge changelog from 1.1 branch

[git-cache] / setup.py

diff --git a/setup.py b/setup.py
index 5af584ae222259d9c77a38a97facc7757f661b1d..2e0b2b91bce20055d9df05c0c335f660b0d7c3a3 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ from setuptools import setup
 
 setup(
     name="git_cache",
-    version="1.1.0",
+    version="1.2.2-pre",
     entry_points={'console_scripts': ['git-cache = git_cache:_main']},
     py_modules=['git_cache'],
 )