Merge branch 'master' into python3
authorFredrik Tolf <fredrik@dolda2000.com>
Tue, 13 Dec 2011 01:57:27 +0000 (02:57 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Tue, 13 Dec 2011 01:57:27 +0000 (02:57 +0100)
commitc221b22d61df5882462eab41e5c79ae2a3ea9642
tree698018abd959d57df6d16024a74a81e8aed9f238
parenta83cfbbc86364b00ad24c0dc7e626345a2185287
parent50140c89086cdbc748250c87dd5b0671bf829369
Merge branch 'master' into python3