Merge branch 'master' into python3
authorFredrik Tolf <fredrik@dolda2000.com>
Thu, 5 Jul 2012 00:24:58 +0000 (02:24 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Thu, 5 Jul 2012 00:24:58 +0000 (02:24 +0200)

No differences found