From: Aditi <aditi.iitr@gmail.com>
Date: Fri, 21 Jun 2013 17:39:22 +0000 (+0530)
Subject: Merge remote-tracking branch 'cweb/master'
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=2719d546a57c2332e36cc056ac80ec5d79672c1a;p=mediagoblin.git

Merge remote-tracking branch 'cweb/master'
---

2719d546a57c2332e36cc056ac80ec5d79672c1a