Merge branch 'master' into python3

Conflicts:
	setup.py

diff --git a/setup.py b/setup.py
index 06c6df7..eb07e39 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -3,11 +3,11 @@
 from distutils.core import setup
 
 setup(name = "pdm3",
-      version = "0.1",
+      version = "0.2",
       description = "Python daemon management library",
       author = "Fredrik Tolf",
       author_email = "fredrik@dolda2000.com",
-      # url = "http://www.dolda2000.com/~fredrik/pdm/",
+      url = "http://www.dolda2000.com/~fredrik/pdm/",
       packages = ["pdm"],
       scripts = ["pdm-repl"],
       license = "GPL-3")