From: Aditi Mittal <aditi.iitr@gmail.com>
Date: Thu, 5 Sep 2013 17:15:10 +0000 (+0530)
Subject: Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=f242807518a3cf079dac86d48dd3c19fc985993e;p=mediagoblin.git

Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
---

f242807518a3cf079dac86d48dd3c19fc985993e