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

Merge branch 'master' into python3

Conflicts:
	pdm/sshsock.py
---