Merge branch 'master' into python3
authorFredrik Tolf <fredrik@dolda2000.com>
Sun, 7 Apr 2013 17:06:40 +0000 (19:06 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Sun, 7 Apr 2013 17:06:40 +0000 (19:06 +0200)
commitcc1126892c7148faadc7b6781acce6a4a99ede5c
tree8aeee65b873ad37f60e75b930b89a87ec2565f9f
parentfd7af0a278cf6a58b8ea371e3e84c99c1cb77e0c
parentb239aa235034b2d44c9f8948503cc2c59f747ed1
Merge branch 'master' into python3

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