From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Wed, 23 Apr 2014 01:35:56 +0000 (+0200)
Subject: Merge branch 'master' into python2
X-Git-Url: http://dolda2000.com/gitweb/?p=wrw.git;a=commitdiff_plain;h=6963e4742e2d7e5eb9f783a5fc0380e18d8e2cb6

Merge branch 'master' into python2
---

6963e4742e2d7e5eb9f783a5fc0380e18d8e2cb6