Merge branch 'master' into python3
authorFredrik Tolf <fredrik@dolda2000.com>
Tue, 4 Jun 2013 14:12:15 +0000 (16:12 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Tue, 4 Jun 2013 14:12:15 +0000 (16:12 +0200)
1  2 
wrw/util.py

diff --cc wrw/util.py
Simple merge