Merged zzzeek/mako into master
Better exception reporting in mako-render
added docs for inherit/include/block confusion
Merged in dharland/mako/patch-mako-render-exception-handling (pull request #4)

Add an exception handler to mako-render
Merge branch 'master' of bitbucket.org:zzzeek/mako into w_json_metadata
changelog
Merge pull request #9 from jvanasco/master

added docs for inherit/include/block confusion
Merge branch 'master' of github.com:zzzeek/mako
- edit new documentation section regarding includes and inheritance
- Fixed bug in Python parsing logic which would fail on Python 3
when a "try/except" targeted a tuple of exception types, rather
than a single exception. fixes #227
- add py.test settings
- fix this update_wrapper thing so tests are reported nicely
Merge branch 'master' into w_json_metadata

Conflicts:
	doc/build/changelog.rst