Merge branch 'master' of github.com:mitsuhiko/flask

flask/_compat.py

@@ -77,7 +77,7 @@ def with_metaclass(meta, *bases):
 # breaks the __exit__ function in a very peculiar way.  This is currently
 # true for pypy 2.2.1 for instance.  The second level of exception blocks
 # is necessary because pypy seems to forget to check if an exception
-# happend until the next bytecode instruction?
+# happened until the next bytecode instruction?
 BROKEN_PYPY_CTXMGR_EXIT = False
 if hasattr(sys, 'pypy_version_info'):
     class _Mgr(object):

flask/helpers.py

@@ -662,7 +662,7 @@ def get_root_path(import_name):
                                'module came from an import hook that does '
                                'not provide file name information or because '
                                'it\'s a namespace package.  In this case '
-                               'the root path needs to be explictly '
+                               'the root path needs to be explicitly '
                                'provided.' % import_name)
 
     # filepath is import_name.py for a module, or __init__.py for a package.