From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Fri, 16 Nov 2012 00:45:40 +0000 (+0100)
Subject: Merge branch 'master' into python3
X-Git-Url: http://dolda2000.com/gitweb/?a=commitdiff_plain;h=22fcd0a7a5074ee0ae7651c4f0da13bb54cf0e5b;hp=22fcd0a7a5074ee0ae7651c4f0da13bb54cf0e5b;p=wrw.git

Merge branch 'master' into python3
---