From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Fri, 23 Dec 2011 06:16:49 +0000 (+0100)
Subject: Merge branch 'master' into python3
X-Git-Url: http://git.dolda2000.com/gitweb/?a=commitdiff_plain;h=d7ad337ed6a9350932b83ed320c4ebd39621e355;p=pdm.git

Merge branch 'master' into python3

Conflicts:
	setup.py
---

d7ad337ed6a9350932b83ed320c4ebd39621e355
diff --cc setup.py
index 06c6df7,9fd505b..eb07e39
--- a/setup.py
+++ b/setup.py
@@@ -2,8 -2,8 +2,8 @@@
  
  from distutils.core import setup
  
 -setup(name = "pdm",
 +setup(name = "pdm3",
-       version = "0.1",
+       version = "0.2",
        description = "Python daemon management library",
        author = "Fredrik Tolf",
        author_email = "fredrik@dolda2000.com",