Merge branch 'master' into python3
authorFredrik Tolf <fredrik@dolda2000.com>
Fri, 27 Sep 2013 05:56:55 +0000 (07:56 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Fri, 27 Sep 2013 05:56:55 +0000 (07:56 +0200)
Conflicts:
setup.py

setup.py

index eb07e39..96a5d22 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@
 from distutils.core import setup
 
 setup(name = "pdm3",
-      version = "0.2",
+      version = "0.3",
       description = "Python daemon management library",
       author = "Fredrik Tolf",
       author_email = "fredrik@dolda2000.com",