From: Aditi <aditi.iitr@gmail.com>
Date: Tue, 16 Jul 2013 01:18:33 +0000 (+0530)
Subject: merge with remote master branch of cweb.
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=67d303ffa96a80da3a3cf48d2f9231bc1a087a19;p=mediagoblin.git

merge with remote master branch of cweb.
---

67d303ffa96a80da3a3cf48d2f9231bc1a087a19