Merge branch 'master' into python3
authorFredrik Tolf <fredrik@dolda2000.com>
Sun, 13 Apr 2014 14:27:40 +0000 (16:27 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Sun, 13 Apr 2014 14:28:59 +0000 (16:28 +0200)

No differences found