Merge remote-tracking branch 'refs/remotes/origin/533-new-dropdown'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Thu, 17 Jan 2013 17:47:29 +0000 (11:47 -0600)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Thu, 17 Jan 2013 17:47:29 +0000 (11:47 -0600)
commitd1d535602cce3d93c5ee32f034d361ef99610cc1
tree655c83c873d6d788820747ec159340a66e2f0b09
parent30af7ce6ad322938d814a80a296846c63fdd2b25
parent10d241976447ab87dfebfebf9679a796400f6445
Merge remote-tracking branch 'refs/remotes/origin/533-new-dropdown'

Conflicts:
mediagoblin/templates/mediagoblin/base.html
mediagoblin/templates/mediagoblin/root.html
mediagoblin/static/css/base.css
mediagoblin/templates/mediagoblin/base.html