Merge branch 'master' into python3
authorFredrik Tolf <fredrik@dolda2000.com>
Mon, 7 Jan 2013 07:02:46 +0000 (08:02 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Mon, 7 Jan 2013 07:02:46 +0000 (08:02 +0100)
commitde8587e854414d6aa37270ade0b93976d3ba1c2a
treec885166490caae5996dd1d24319d50768d667bce
parent578de289fa6936c1a6b21cc962b5a64d5a3a0e52
parent342c8c21078cb74025b2f242b3649628a96ccb1d
Merge branch 'master' into python3