Merge branch 'master' into python3
authorFredrik Tolf <fredrik@dolda2000.com>
Tue, 28 Aug 2012 00:58:16 +0000 (02:58 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Tue, 28 Aug 2012 00:58:16 +0000 (02:58 +0200)

No differences found