[Python-checkins] cpython (merge 3.4 -> default): null merge from 3.4

[ethan.furman]

https://hg.python.org/cpython/rev/d1bf181afa82
changeset:   95056:d1bf181afa82
parent:      95054:c93d46fd85ee
parent:      95055:5dd7b5fb65e7
user:        Ethan Furman <ethan at stoneleaf.us>
date:        Wed Mar 18 18:26:08 2015 -0700
summary:
  null merge from 3.4

files:



-- 
Repository URL: https://hg.python.org/cpython