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

Merge branch 'master' into python3
---