Merge branch 'master' of https://github.com/Xion/flask into Xion-master

Conflicts:
	flask/testsuite/config.py

flask/testsuite/__init__.py

@@ -157,6 +157,9 @@ class FlaskTestCase(unittest.TestCase):
     def assert_not_in(self, x, y):
         self.assertNotIn(x, y)
 
+    def assert_isinstance(self, obj, cls):
+        self.assertIsInstance(obj, cls)
+
     if sys.version_info[:2] == (2, 6):
         def assertIn(self, x, y):
             assert x in y, "%r unexpectedly not in %r" % (x, y)