RedHatTraining/pyramid.git

Chris McDonough

2012-09-16 401b371e7933f48e4fac2627fa54f85ff9f0a9f0

refs
author	Chris McDonough <chrism@plope.com>
	Sunday, September 16, 2012 09:54 +0200
committer	Chris McDonough <chrism@plope.com>
	Sunday, September 16, 2012 09:54 +0200
commit	401b371e7933f48e4fac2627fa54f85ff9f0a9f0
tree	e6398a67619d29161d46f96df646cb736a73f4c7 tree \| zip \| gz
parent	fa4672fcb490dd0767fed10c557734b43cd845b8 view \| diff 64452edb014423054d1bbc0bb3ed8a3e47b6f611 view \| diff

Merge branch 'feature.subrequest'

2 files added

8 files modified

	CHANGES.txt	12 ●●●●● diff \| view \| raw \| blame \| history
	TODO.txt	9 ●●●●● diff \| view \| raw \| blame \| history
	docs/api/request.rst	49 ●●●●● diff \| view \| raw \| blame \| history
	docs/index.rst	1 ●●●●● diff \| view \| raw \| blame \| history
	docs/latexindex.rst	1 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/subrequest.rst	186 ●●●●● diff \| view \| raw \| blame \| history
	docs/whatsnew-1.4.rst	16 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/router.py	104 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/pkgs/subrequestapp/__init__.py	20 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/test_integration.py	51 ●●●●● diff \| view \| raw \| blame \| history