Merge branch 'master' into python3
authorFredrik Tolf <fredrik@dolda2000.com>
Sat, 6 Apr 2013 16:07:15 +0000 (18:07 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Sat, 6 Apr 2013 16:08:26 +0000 (18:08 +0200)
commitfd7af0a278cf6a58b8ea371e3e84c99c1cb77e0c
tree2bd313ab69cc493cfc02647a0573bea4380b220b
parenta7a0908019bb95bb2be1c01e97e88f344807ccec
parent5a071401aade4fa5c1d3ef852a5861cb94475e73
Merge branch 'master' into python3

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