From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Mon, 7 Jan 2013 06:28:45 +0000 (+0100)
Subject: Merge branch 'master' into python3
X-Git-Url: http://dolda2000.com/gitweb/?a=commitdiff_plain;h=98ecc02e068d7108325210c9fd9f510ec7bae66c;hp=98ecc02e068d7108325210c9fd9f510ec7bae66c;p=pdm.git

Merge branch 'master' into python3

Conflicts:
	pdm/sshsock.py
---