Merge branch 'master' into python3
authorFredrik Tolf <fredrik@dolda2000.com>
Sun, 13 May 2012 03:43:33 +0000 (05:43 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Sun, 13 May 2012 03:43:33 +0000 (05:43 +0200)
commit7bcaef26c590cd10955848fbf313f41c78b8d1ce
treeb6255ed364d2adaf1a6eb8ea1fd7eb41fa70d43f
parentdc437c45b69d2c163141c422d354f2c25936061f
parentef04ec8791734c918a5b8940976bf3fde3618710
Merge branch 'master' into python3

Conflicts:
wrw/resp.py
wrw/resp.py