Merge branch 'master' into python3
authorFredrik Tolf <fredrik@dolda2000.com>
Thu, 30 Aug 2012 08:20:25 +0000 (10:20 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Thu, 30 Aug 2012 08:28:51 +0000 (10:28 +0200)

No differences found