Merge branch 'master' into python3
authorFredrik Tolf <fredrik@dolda2000.com>
Wed, 5 Jun 2013 10:58:21 +0000 (12:58 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Wed, 5 Jun 2013 10:58:21 +0000 (12:58 +0200)

No differences found