RedHatTraining/pyramid.git

Chris McDonough

2013-07-24 d79c0338e6b87ffa657f91065ce73c752f60a0b8

refs
author	Chris McDonough <chrism@plope.com>
	Wednesday, July 24, 2013 22:02 +0200
committer	Chris McDonough <chrism@plope.com>
	Wednesday, July 24, 2013 22:02 +0200
commit	d79c0338e6b87ffa657f91065ce73c752f60a0b8
tree	458ac51936a8c58459a1fcb3cf9f23c697465e92 tree \| zip \| gz
parent	f47bccfb279ff102d1be2b4b37c201a4cde8f365 view \| diff 716464c1706e7f68977bd5467023b6380d05e545 view \| diff

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

1 files added

15 files modified

	CHANGES.txt	52 ●●●●● diff \| view \| raw \| blame \| history
	CONTRIBUTORS.txt	2 ●●●●● diff \| view \| raw \| blame \| history
	HACKING.txt	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/authorintro.rst	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/conf.py	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/index.rst	5 ●●●●● diff \| view \| raw \| blame \| history
	docs/latexindex.rst	27 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/renderers.rst	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/whatsnew-1.5.rst	125 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/authentication.py	40 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/config/routes.py	4 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/router.py	6 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/testing.py	2 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/test_authentication.py	24 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/test_router.py	8 ●●●●● diff \| view \| raw \| blame \| history
	setup.py	2 ●●●●● diff \| view \| raw \| blame \| history