From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Fri, 21 Jun 2013 20:50:36 +0000 (-0500)
Subject: Merge remote-tracking branch 'refs/remotes/rodney757-github/mail'
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=c482f0149d566156c4017fa58a8d57ffde90b1dc;p=mediagoblin.git

Merge remote-tracking branch 'refs/remotes/rodney757-github/mail'
---

c482f0149d566156c4017fa58a8d57ffde90b1dc