Merge branch 'python2.6' into v1.1.x (explicit format specifiers)
authorW. Trevor King <wking@tremily.us>
Sat, 17 Nov 2012 13:43:27 +0000 (08:43 -0500)
committerW. Trevor King <wking@tremily.us>
Sat, 17 Nov 2012 13:43:27 +0000 (08:43 -0500)
commit6681f8324baaf7d8ac9fc132532f4a70259e550a
tree802b54d726c9aa28fbeb62a199aa1f95677ec3d1
parentfc7de5992fba9df0564c684248b88b08f0212e50
parent0b0e4f6648f04e8c3066b77d17bc46bef0cc027f
Merge branch 'python2.6' into v1.1.x (explicit format specifiers)