Merge branch 'master' into python3
authorFredrik Tolf <fredrik@dolda2000.com>
Mon, 7 Jan 2013 06:28:45 +0000 (07:28 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Mon, 7 Jan 2013 06:28:45 +0000 (07:28 +0100)
commit98ecc02e068d7108325210c9fd9f510ec7bae66c
tree91bb3e6879e5aefeb082bb9ca3cebdb7141ed86d
parent16e7fd3d4abbec9f5e6d976a2feca87176e79e29
parente3250828c55a4795bfd7ca03d3ef52c56e843252
Merge branch 'master' into python3

Conflicts:
pdm/sshsock.py
pdm-repl
pdm/sshsock.py