From: tilly-Q <nattilypigeonfowl@gmail.com>
Date: Wed, 14 May 2014 17:02:30 +0000 (-0400)
Subject: Merge branch 'metadata'
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=da537ed44ef855954696a18dccd832feb6e56328;p=mediagoblin.git

Merge branch 'metadata'
---

da537ed44ef855954696a18dccd832feb6e56328