SIGN IN SIGN UP

Sync trunk and py3k versions of string formatting. Manual merge of r74219.

E
Eric Smith committed
88af7432fc888bd1f3bb8fb68b1be243dcaae8ca
Parent: 34f7e32