Merge branch 'master' into python3
authorFredrik Tolf <fredrik@dolda2000.com>
Sun, 1 Jan 2012 21:42:41 +0000 (22:42 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Sun, 1 Jan 2012 21:42:41 +0000 (22:42 +0100)
commitf593b3dbae242213fa6ea3e1b11310fe15d6ddad
treee02c55e9a0b22860ad9596278b060ff7825e975b
parentca6fd155fd1cf58241c9d136977c2fd08948b51b
parentf84a3f10e332cd8e67230551e3146dd900a97c0a
Merge branch 'master' into python3

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