Merge branch 'master' into slapos

970fd62a · Łukasz Nowak · 0e7564df · 7451dbfd · 970fd62a · 970fd62a
Commit 970fd62a authored Jun 27, 2011 by Łukasz Nowak
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

CHANGES.txt CHANGES.txt +5 -0

setup.py setup.py +1 -1

No files found.
--- a/CHANGES.txt
+++ b/CHANGES.txt
+0.10 (unreleased)
+================
+
+ * No change yet.
+
 0.9 (2011-06-24)
 ================


--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 import glob
 import os

-version = '0.9'
+version = '0.10dev'
 name = 'slapos.cookbook'
 long_description = open("README.txt").read() + "\n" + \
    open("CHANGES.txt").read() + "\n"