Merge branch 'master' into python3
authorFredrik Tolf <fredrik@dolda2000.com>
Fri, 23 Dec 2011 06:16:49 +0000 (07:16 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Fri, 23 Dec 2011 06:16:49 +0000 (07:16 +0100)
commitd7ad337ed6a9350932b83ed320c4ebd39621e355
treeb427429383d7da822ecd3d85f924eb83300306c1
parentc58b1ad8cc6658ea46ed049f6909b4ce05906b57
parent6da1155c52905bf3432a9f48cbde350528232282
Merge branch 'master' into python3

Conflicts:
setup.py
setup.py