Merge branch 'master' into python3
authorFredrik Tolf <fredrik@dolda2000.com>
Wed, 18 Jul 2012 00:16:28 +0000 (02:16 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Wed, 18 Jul 2012 00:17:59 +0000 (02:17 +0200)

No differences found