Merge: #9351: set_defaults on subparser is no longer ignored if set on parent.

author R David Murray <rdmurray@bitdance.com>

Fri, 17 Oct 2014 23:58:03 +0000 (19:58 -0400)

committer R David Murray <rdmurray@bitdance.com>

Fri, 17 Oct 2014 23:58:03 +0000 (19:58 -0400)
author R David Murray <rdmurray@bitdance.com>
Fri, 17 Oct 2014 23:58:03 +0000 (19:58 -0400)
committer R David Murray <rdmurray@bitdance.com>
Fri, 17 Oct 2014 23:58:03 +0000 (19:58 -0400)
diff --cc Lib/test/test_argparse.py
Simple merge
diff --cc Misc/NEWS
Simple merge
author	R David Murray <rdmurray@bitdance.com>
	Fri, 17 Oct 2014 23:58:03 +0000 (19:58 -0400)
committer	R David Murray <rdmurray@bitdance.com>
	Fri, 17 Oct 2014 23:58:03 +0000 (19:58 -0400)
		1	2
Lib/test/test_argparse.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history