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)
commitf4f9d7ca95a7a00096622961c00d3c941ee846b7
tree1f6da641b6b140e9f33a1f5e81853bee1f85c9d1
parent50bf38b26ee0cba6c30ed2484bf10155ba853497
parentb2c8dbcf8507811fe931a48722ed9c8b530bcdae
Merge remote-tracking branch 'refs/remotes/tsyesika/599-allow-email-login'