Merge branch 'metadata' of gitorious.org:mediagoblin/cwebbers-mediagoblin into metadata
authortilly-Q <nattilypigeonfowl@gmail.com>
Mon, 12 May 2014 21:14:55 +0000 (17:14 -0400)
committertilly-Q <nattilypigeonfowl@gmail.com>
Mon, 12 May 2014 21:14:55 +0000 (17:14 -0400)
commitf14519c398c6c725ee4a1057f52c1404e7d1dd84
treee7e8872badb91a6d74745887bbcb1d9392b9dc73
parent8524a6bdc575312b35df6e6aa3118ed139303d72
parentacfcaf6366bd4695c1c37c7aa8ff5a176b412e2a
Merge branch 'metadata' of gitorious.org:mediagoblin/cwebbers-mediagoblin into metadata

Conflicts:
mediagoblin/plugins/metadata_display/templates/mediagoblin/plugins/metadata_display/metadata_table.html
mediagoblin/plugins/metadata_display/templates/mediagoblin/plugins/metadata_display/metadata_table.html