Merge branch 'master' into python3
authorFredrik Tolf <fredrik@dolda2000.com>
Sun, 15 Jan 2012 07:06:54 +0000 (08:06 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Sun, 15 Jan 2012 07:06:54 +0000 (08:06 +0100)
1  2 
pdm/cli.py

diff --cc pdm/cli.py
Simple merge