Merge remote-tracking branch 'alienacorn/master'
authorW. Trevor King <wking@tremily.us>
Tue, 19 Mar 2013 00:31:46 +0000 (20:31 -0400)
committerW. Trevor King <wking@tremily.us>
Tue, 19 Mar 2013 00:31:46 +0000 (20:31 -0400)
* alienacorn/master:
  email: Change stray SMTP_SERVER to server

Signed-off-by: W. Trevor King <wking@tremily.us>

Trivial merge