]> granicus.if.org Git - python/commitdiff
Merge from 3.4
authorAndrew Kuchling <amk@amk.ca>
Tue, 14 Apr 2015 13:59:09 +0000 (09:59 -0400)
committerAndrew Kuchling <amk@amk.ca>
Tue, 14 Apr 2015 13:59:09 +0000 (09:59 -0400)
1  2 
Lib/gettext.py

diff --cc Lib/gettext.py
Simple merge