Merge branch 'master' into python3
authorFredrik Tolf <fredrik@dolda2000.com>
Mon, 27 Aug 2012 05:49:38 +0000 (07:49 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Mon, 27 Aug 2012 05:49:38 +0000 (07:49 +0200)

No differences found