From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Wed, 5 Jun 2013 10:58:21 +0000 (+0200)
Subject: Merge branch 'master' into python3
X-Git-Url: http://dolda2000.com/gitweb/?a=commitdiff_plain;h=3b67497cb853ea7dd49f579566e5f0b60a3c97d7;hp=3b67497cb853ea7dd49f579566e5f0b60a3c97d7;p=wrw.git

Merge branch 'master' into python3
---