From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Sun, 13 Apr 2014 14:27:40 +0000 (+0200)
Subject: Merge branch 'master' into python3
X-Git-Url: http://dolda2000.com/gitweb/?p=pdm.git;a=commitdiff_plain;h=86b3a0acd5fd18f7816ae91e2839ead5dfab0e33;hp=86b3a0acd5fd18f7816ae91e2839ead5dfab0e33

Merge branch 'master' into python3
---