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)
commit144c745cd600fc7c050f5426fe438430885ef5b8
tree376fa2011369336587dbda9924c1e6d4a534c311
parent864a9d46e7cc4a67bd244947b933baabc69c902f
parent73c1ef8bb613a660f37fbe0cfe50b74fc5925229
Merge branch 'master' into python3

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