Merge branch 'master' into python3
authorFredrik Tolf <fredrik@dolda2000.com>
Sat, 7 Dec 2013 21:51:13 +0000 (22:51 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Sat, 7 Dec 2013 21:51:13 +0000 (22:51 +0100)

No differences found