- Testcase
- Allow callable classes to have contextfunction and the like
Merge branch 'callable_class_contextfunction' of git://github.com/Naddiseo/jinja2 into Naddiseo-callable_class_contextfunction

Conflicts:
	jinja2/testsuite/regression.py