Merge branch 'master' into python3
authorFredrik Tolf <fredrik@dolda2000.com>
Fri, 23 Dec 2011 00:53:15 +0000 (01:53 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Fri, 23 Dec 2011 00:53:15 +0000 (01:53 +0100)
Conflicts:
pdm/cli.py
pdm/srv.py


No differences found