Merge remote-tracking branch 'refs/remotes/upstream/master' into 569-application...
authorNathan Yergler <nathan@yergler.net>
Sat, 1 Oct 2011 19:08:58 +0000 (12:08 -0700)
committerNathan Yergler <nathan@yergler.net>
Sat, 1 Oct 2011 19:08:58 +0000 (12:08 -0700)
commit6bfbe0242653678c09258b7a642514d706153eac
treed3e0c7f94f566886a6b80ce98d8a003465f4368f
parent0a8a3fc1571100aba3bd3a3dec98f5e9e252780b
parent573aba86b58c2ab064d0d57ed0bbae6bdf9a2819
Merge remote-tracking branch 'refs/remotes/upstream/master' into 569-application-middleware

Conflicts:
mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html
mediagoblin/config_spec.ini
mediagoblin/templates/mediagoblin/auth/login.html
mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html
mediagoblin/util.py