Merge branch 'master' into python3
authorFredrik Tolf <fredrik@dolda2000.com>
Mon, 7 Jan 2013 06:35:42 +0000 (07:35 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Mon, 7 Jan 2013 06:35:42 +0000 (07:35 +0100)
commit578de289fa6936c1a6b21cc962b5a64d5a3a0e52
treeebac7858a19764f2fa92dfdebe97b8a299961f3a
parent98ecc02e068d7108325210c9fd9f510ec7bae66c
parent1a8ebe554dad381da2df0200b50a9c9f676d84c2
Merge branch 'master' into python3

Conflicts:
pdm/sshsock.py
pdm/sshsock.py