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)
commit41a14c6efc1dd9cfc36f1b2eb4cb3f3b34e4d975
tree52fee3564663e94c7d30c588156fe8c20b7b8c25
parent87bca496b28ec9b98144747767bb1c8e8dec4676
parent6db23bd9b6cb9198a516065988d64c5322f9f175
Merge remote-tracking branch 'remotes/lotusecho/trac_711_test_speed'
mediagoblin/app.py
mediagoblin/tests/test_mgoblin_app.ini