From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Fri, 27 Sep 2013 05:56:55 +0000 (+0200)
Subject: Merge branch 'master' into python3
X-Git-Url: http://dolda2000.com/gitweb/?p=pdm.git;a=commitdiff_plain;h=38fac1fb15e1d32173edbef33b07f8fc7799ae02;hp=ebe466f227b464a7457dee55accb1b426821c7c9

Merge branch 'master' into python3

Conflicts:
	setup.py
---

diff --git a/setup.py b/setup.py
index eb07e39..96a5d22 100755
--- 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",