merge 3.3
authorBenjamin Peterson <benjamin@python.org>
Tue, 26 May 2015 02:24:48 +0000 (21:24 -0500)
committerBenjamin Peterson <benjamin@python.org>
Tue, 26 May 2015 02:24:48 +0000 (21:24 -0500)
commit82d8f06fcd1926906de0ee5ff1154476b7a37ae8
tree41a53c94c04a2bb06586735dada8f5ee77bfb81a
parent387729e183365a366c48fce7a9abfcaf4ec6ff4e
parent86c3a3b0b7b542cc268f7b8812a59a40b7c47e26
mergeĀ 3.3