Merge branch 'master' into python3
authorFredrik Tolf <fredrik@dolda2000.com>
Fri, 27 Sep 2013 05:56:55 +0000 (07:56 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Fri, 27 Sep 2013 05:56:55 +0000 (07:56 +0200)
Conflicts:
setup.py


No differences found