Merge remote-tracking branch 'remotes/lotusecho/trac_711_test_speed'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Wed, 3 Jul 2013 19:07:11 +0000 (14:07 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Wed, 3 Jul 2013 19:07:11 +0000 (14:07 -0500)
1  2 
mediagoblin/app.py
mediagoblin/tests/test_mgoblin_app.ini

Simple merge