From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Mon, 4 Mar 2013 17:45:27 +0000 (-0600)
Subject: Merge branch 'joar-skip_transcoding'
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=55c7bf592c07e560fd38943eba4ed2f538cc4bb4;p=mediagoblin.git

Merge branch 'joar-skip_transcoding'
---

55c7bf592c07e560fd38943eba4ed2f538cc4bb4