Merge branch 'master' into python3
authorFredrik Tolf <fredrik@dolda2000.com>
Thu, 5 Jul 2012 04:24:25 +0000 (06:24 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Thu, 5 Jul 2012 04:24:25 +0000 (06:24 +0200)
1  2 
wrw/sp/util.py

diff --cc wrw/sp/util.py
Simple merge