]> granicus.if.org Git - python/commitdiff
Merge #17987: properly document support.captured_xxx.
authorR David Murray <rdmurray@bitdance.com>
Thu, 11 Jul 2013 16:29:31 +0000 (12:29 -0400)
committerR David Murray <rdmurray@bitdance.com>
Thu, 11 Jul 2013 16:29:31 +0000 (12:29 -0400)
1  2 
Lib/test/support.py
Misc/ACKS

Simple merge
diff --cc Misc/ACKS
Simple merge