Null merge with 3.4
authorZachary Ware <zachary.ware@gmail.com>
Sun, 25 Oct 2015 04:26:42 +0000 (23:26 -0500)
committerZachary Ware <zachary.ware@gmail.com>
Sun, 25 Oct 2015 04:26:42 +0000 (23:26 -0500)
commit8e66a73702924dcc75d7925532dcb4d8e9cd0f36
tree573fbdfbdf1f2eebe412d73b8193b315777d8214
parent2775d85d55a092e3aca9a72bf2e5328d95b0340f
parentf085a16f55bbd3f8403df3cb094ccd4c16044b6b
Null merge with 3.4

(tkinter._fix no longer exists in 3.5+)