Merge branch 'master' into python3
authorFredrik Tolf <fredrik@dolda2000.com>
Fri, 23 Dec 2011 01:30:26 +0000 (02:30 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Fri, 23 Dec 2011 01:30:26 +0000 (02:30 +0100)
commit28203f3fefeaa864b8f14390b7a72d5081a94ce8
tree9db23a3713793c55620ab1de590f6234a2d6bf40
parent144c745cd600fc7c050f5426fe438430885ef5b8
parent5463509c7f8c15ae648eea644bea001a043d8b09
Merge branch 'master' into python3

Conflicts:
pdm/perf.py
pdm/cli.py
pdm/perf.py