Merge branch 'master' into python3
authorFredrik Tolf <fredrik@dolda2000.com>
Thu, 30 Aug 2012 14:14:19 +0000 (16:14 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Thu, 30 Aug 2012 14:14:19 +0000 (16:14 +0200)

No differences found