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)
Conflicts:
setup.py


No differences found