Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin into metadata
authortilly-Q <nattilypigeonfowl@gmail.com>
Tue, 13 May 2014 19:24:59 +0000 (15:24 -0400)
committertilly-Q <nattilypigeonfowl@gmail.com>
Tue, 13 May 2014 19:24:59 +0000 (15:24 -0400)
commit1d09e8b4f1be938a3415329f4fd93e4f6936b16a
treeb14feac978e2bbd2eb9f79a81ce220cf51356f76
parentb5dd2459893fd1e7ae1376a7573a36bf15c983f7
parentcc7c9091acf4103d5a0e9a910eeb07bfb01b2916
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin into metadata

Conflicts:
mediagoblin/gmg_commands/__init__.py
docs/source/siteadmin/commandline-upload.rst
mediagoblin/gmg_commands/__init__.py
mediagoblin/plugins/metadata_display/templates/mediagoblin/plugins/metadata_display/bits/metadata_extra_head.html
mediagoblin/tools/metadata.py