Merge branch 'master' into python3
authorFredrik Tolf <fredrik@dolda2000.com>
Fri, 16 Nov 2012 00:45:40 +0000 (01:45 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Fri, 16 Nov 2012 00:45:40 +0000 (01:45 +0100)

No differences found