Merge branch 'master' into develop

This commit is contained in:
kmooney 2011-06-30 12:37:39 -05:00
commit 9843cb8190

View file

@ -79,6 +79,8 @@ def get_template_source(name):
source, origin = load_template_source(name)
if source:
return source
except NotImplementedError:
pass
except TemplateDoesNotExist:
pass
if source is None and VERSION[:2] < (1, 2):