Merge branch 'master' into python3
authorFredrik Tolf <fredrik@dolda2000.com>
Sun, 3 Nov 2013 14:10:10 +0000 (15:10 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Sun, 3 Nov 2013 14:17:43 +0000 (15:17 +0100)

No differences found