From: Christopher Allan Webber Date: Sun, 14 Apr 2013 01:11:11 +0000 (-0500) Subject: Merge remote-tracking branch 'refs/remotes/tsyesika/599-allow-email-login' X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=f4f9d7ca95a7a00096622961c00d3c941ee846b7;p=mediagoblin.git Merge remote-tracking branch 'refs/remotes/tsyesika/599-allow-email-login' --- f4f9d7ca95a7a00096622961c00d3c941ee846b7