Merge branch 'master' into python3
authorFredrik Tolf <fredrik@dolda2000.com>
Sat, 2 Feb 2013 05:29:04 +0000 (06:29 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Sat, 2 Feb 2013 05:29:04 +0000 (06:29 +0100)
commita7a0908019bb95bb2be1c01e97e88f344807ccec
tree2093c8402859fa287f396833c2fb226efd88725c
parentcb8bb5edc89f083d161a7c5c9f4ed904838e1266
parent77dd732a3b3b604a6029e748ffd4fb0b9760642d
Merge branch 'master' into python3

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