From: Aditi <aditi.iitr@gmail.com>
Date: Sun, 30 Jun 2013 14:19:53 +0000 (+0530)
Subject: Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=c5b7f89711cd3660bf01103b7bc186465d2064a7;p=mediagoblin.git

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

"Merge with cweb/master."
---

c5b7f89711cd3660bf01103b7bc186465d2064a7