RedHatTraining/pyramid.git

Chris McDonough

2013-01-12 3ac960c7d1a77d89d84931c34dbed5ab57cdbe66

refs
author	Chris McDonough <chrism@plope.com>
	Saturday, January 12, 2013 07:19 +0100
committer	Chris McDonough <chrism@plope.com>
	Saturday, January 12, 2013 07:19 +0100
commit	3ac960c7d1a77d89d84931c34dbed5ab57cdbe66
tree	59bb15ff08231e4986b9d0f66903a894d60f11b5 tree \| zip \| gz
parent	99ca9e74cc119328987fc1cd0c377b8380beccdf view \| diff 464ddc91ea47e3d6ba8fe30b8e9381cd395bb1d9 view \| diff

Merge branch 'master' of github.com:Pylons/pyramid

15 files modified

	HACKING.txt	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/api/path.rst	3 ●●●●● diff \| view \| raw \| blame \| history
	docs/designdefense.rst	6 ●●●●● diff \| view \| raw \| blame \| history
	docs/glossary.rst	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/index.rst	5 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/install.rst	21 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/introduction.rst	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/upgrading.rst	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/viewconfig.rst	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/authorization.rst	19 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/background.rst	5 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/basiclayout.rst	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/definingmodels.rst	24 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/installation.rst	8 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/testing.py	2 ●●●●● diff \| view \| raw \| blame \| history