From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Wed, 16 Jan 2013 17:06:22 +0000 (-0600)
Subject: Merge remote-tracking branch 'refs/remotes/elrond/misc/use_media_id'
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=27aebe05a64862d552646b2b1e6c59fbe39ae1d5;p=mediagoblin.git

Merge remote-tracking branch 'refs/remotes/elrond/misc/use_media_id'
---

27aebe05a64862d552646b2b1e6c59fbe39ae1d5