RedHatTraining/pyramid.git

Chris McDonough

2012-02-08 89eeb971cdc0d499015a39300ff8662b0f31f0e5

refs
author	Chris McDonough <chrism@plope.com>
	Wednesday, February 8, 2012 02:18 +0100
committer	Chris McDonough <chrism@plope.com>
	Wednesday, February 8, 2012 02:18 +0100
commit	89eeb971cdc0d499015a39300ff8662b0f31f0e5
tree	93b19aab92368cac99bf591f3bcea0107f7e17b3 tree \| zip \| gz
parent	f4952ee0d30eeb67976684d6422f5db05d9f5264 view \| diff 1ceae4adac7c050e955778c71b3680edb9a3cb8c view \| diff

Merge branch '1.3-branch' of github.com:Pylons/pyramid into 1.3-branch

5 files modified

	CHANGES.txt	11 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/urldispatch.rst	2 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/config/util.py	14 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/config/views.py	8 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/test_config/test_util.py	16 ●●●●● diff \| view \| raw \| blame \| history