From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Fri, 23 Dec 2011 00:53:15 +0000 (+0100)
Subject: Merge branch 'master' into python3
X-Git-Tag: 0.1~2
X-Git-Url: http://dolda2000.com/gitweb/?a=commitdiff_plain;h=144c745cd600fc7c050f5426fe438430885ef5b8;hp=144c745cd600fc7c050f5426fe438430885ef5b8;p=pdm.git

Merge branch 'master' into python3

Conflicts:
	pdm/cli.py
	pdm/srv.py
---