Merge branch 'master' into python3
authorFredrik Tolf <fredrik@dolda2000.com>
Fri, 29 Jun 2012 02:35:17 +0000 (04:35 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Fri, 29 Jun 2012 02:35:17 +0000 (04:35 +0200)
commit6dfbe755cbc3ca1e6af3842d49fb8c6adad4e6c5
tree3af43c04bc744bce4f2bdfdf4dfe4b3f1ca052fa
parentab92e396057cd617b1607f437d860ff89f5780a2
parentbe8dc8230fa1c6eb5104fa4983d23e585a40492b
Merge branch 'master' into python3

Conflicts:
wrw/__init__.py
wrw/__init__.py