Merge remote-tracking branch 'refs/remotes/tsyesika/599-allow-email-login'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 14 Apr 2013 01:11:11 +0000 (20:11 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 14 Apr 2013 01:11:11 +0000 (20:11 -0500)

Trivial merge