From: Christopher Allan Webber Date: Fri, 10 May 2013 16:23:36 +0000 (-0500) Subject: Merge remote-tracking branch 'refs/remotes/merge-requests/47' X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=fcfcd1f8a3712cfd58889234b7fd40a45c831161;p=mediagoblin.git Merge remote-tracking branch 'refs/remotes/merge-requests/47' --- fcfcd1f8a3712cfd58889234b7fd40a45c831161