Merge branch 'master' into python3
authorFredrik Tolf <fredrik@dolda2000.com>
Sat, 28 Dec 2013 05:48:03 +0000 (06:48 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Sat, 28 Dec 2013 05:48:03 +0000 (06:48 +0100)
commit537064f6656c313c601126692d31628a85de663d
treef4ea89ccab7415d124a8f330a33912dd1b85dfba
parentcb66c33fdb75345266af29fc4063bf833100cca5
parent8437855e8e2e18058681a1b63c77d0ec970535cb
Merge branch 'master' into python3

Conflicts:
wrw/sp/util.py
wrw/sp/util.py