From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Fri, 23 Dec 2011 06:16:49 +0000 (+0100)
Subject: Merge branch 'master' into python3
X-Git-Url: http://dolda2000.com/gitweb/?a=commitdiff_plain;h=d7ad337ed6a9350932b83ed320c4ebd39621e355;hp=d7ad337ed6a9350932b83ed320c4ebd39621e355;p=pdm.git

Merge branch 'master' into python3

Conflicts:
	setup.py
---