From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Sun, 5 Jan 2014 08:10:36 +0000 (+0100)
Subject: Merge branch 'master' into python3
X-Git-Url: http://dolda2000.com/gitweb/?a=commitdiff_plain;h=b0f95b219e2f9aea9f81d696adbfaaa0e41a6eaf;hp=b0f95b219e2f9aea9f81d696adbfaaa0e41a6eaf;p=wrw.git

Merge branch 'master' into python3
---