Merge branch 'master' of git.dolda2000.com:/srv/git/r/pdm
authorFredrik Tolf <fredrik@dolda2000.com>
Thu, 22 Dec 2011 06:47:01 +0000 (07:47 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Thu, 22 Dec 2011 06:47:01 +0000 (07:47 +0100)
1  2 
pdm/cli.py

diff --cc pdm/cli.py
Simple merge