From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Sat, 7 Dec 2013 21:51:13 +0000 (+0100)
Subject: Merge branch 'master' into python3
X-Git-Url: http://git.dolda2000.com/gitweb/?a=commitdiff_plain;h=dc590bea957bbffa808e6cf3f516d4ae9beda98a;p=wrw.git

Merge branch 'master' into python3
---

dc590bea957bbffa808e6cf3f516d4ae9beda98a