From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Fri, 3 Jun 2011 23:43:20 +0000 (-0500)
Subject: Merge branch 'media_edit'
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=3f0679cd78363801f7b2b99a3278f416d45f5624;p=mediagoblin.git

Merge branch 'media_edit'
---

3f0679cd78363801f7b2b99a3278f416d45f5624