Merge branch 'master' into python3
authorFredrik Tolf <fredrik@dolda2000.com>
Thu, 3 Apr 2014 04:03:53 +0000 (06:03 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Thu, 3 Apr 2014 04:03:53 +0000 (06:03 +0200)
commit425ebacf6c53fa475ad0e8c7aea62d19617d4aea
treea266b6dbad39ba88a7c4328663f10b63e58b9599
parent3a774098a13421bc63c995c8dbfc9c716397d324
parent691f278cd4876685033cf7377ee77a3220e3d216
Merge branch 'master' into python3

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