]> granicus.if.org Git - python/commitdiff
Merge from 3.3 (Issue #15209)
authorNick Coghlan <ncoghlan@gmail.com>
Sat, 8 Dec 2012 12:24:23 +0000 (22:24 +1000)
committerNick Coghlan <ncoghlan@gmail.com>
Sat, 8 Dec 2012 12:24:23 +0000 (22:24 +1000)
1  2 
Doc/library/exceptions.rst
Misc/NEWS

Simple merge
diff --cc Misc/NEWS
Simple merge