Merge branch 'master' into python2
authorFredrik Tolf <fredrik@dolda2000.com>
Fri, 9 May 2014 06:15:16 +0000 (08:15 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Fri, 9 May 2014 06:15:16 +0000 (08:15 +0200)
1  2 
wrw/util.py

diff --cc wrw/util.py
Simple merge