Merge branch '0.10-maintenance'

Conflicts:
	tox.ini

.travis-devel-requirements.txt

@@ -1,3 +1,6 @@
 git+git://github.com/mitsuhiko/werkzeug.git#egg=Werkzeug
 git+git://github.com/mitsuhiko/jinja2.git#egg=Jinja2
 git+git://github.com/mitsuhiko/itsdangerous.git#egg=itsdangerous
+
+# extra dependencies
+hg+http://bitbucket.org/jek/blinker#egg=blinker

.travis-lowest-requirements.txt

@@ -1,3 +1,6 @@
 Werkzeug==0.7
 Jinja2==2.4
 itsdangerous==0.21
+
+# extra dependencies
+blinker==1.0

.travis-release-requirements.txt

@@ -0,0 +1,2 @@
+# extra dependencies
+blinker

CHANGES

@@ -3,6 +3,13 @@ Flask Changelog
 
 Here you can see the full list of changes between each Flask release.
 
+Version 0.10.2
+--------------
+
+(bugfix release, release date to be announced)
+
+- Fixed broken `test_appcontext_signals()` test case.
+
 Version 0.10.1
 --------------
 

flask/testsuite/signals.py

@@ -102,7 +102,7 @@ class SignalsTestCase(FlaskTestCase):
         def record_push(sender, **kwargs):
             recorded.append('push')
         def record_pop(sender, **kwargs):
-            recorded.append('push')
+            recorded.append('pop')
 
         @app.route('/')
         def index():

tox.ini

@@ -2,4 +2,5 @@
 envlist = py26, py27, pypy, py33
 
 [testenv]
+deps = blinker
 commands = python run-tests.py []