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

1  2 
setup.py

diff --cc setup.py
+++ b/setup.py
@@@ -2,8 -2,8 +2,8 @@@
  
  from distutils.core import setup
  
 -setup(name = "pdm",
 +setup(name = "pdm3",
-       version = "0.2",
+       version = "0.3",
        description = "Python daemon management library",
        author = "Fredrik Tolf",
        author_email = "fredrik@dolda2000.com",