<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -137,7 +137,7 @@ And, as a reminder, the fingerprint of the election itself is:
 The Helios Voting System
 &quot;&quot;&quot; % (voter.name, election_obj.name, voter.get_vote_hash(), election_obj.hash)
 
-    mail.simple_send([voter.name],[voter.email], &quot;Helios&quot;, &quot;system@heliosvoting.org&quot;, &quot;your vote was recorded&quot;, mail_body)
+    mail.simple_send([voter.name],[voter.email], &quot;Helios&quot;, &quot;ben@adida.net&quot;, &quot;your vote was recorded&quot;, mail_body)
 
     return SUCCESS
 
@@ -718,7 +718,7 @@ class ElectionController(REST.Resource):
     if user:
       sender_email = user.email_address
     else:
-      sender_email = &quot;system@heliosvoting.org&quot;
+      sender_email = &quot;ben@adida.net&quot;
 
     for voter in voters:
       logging.info(&quot;sending email to %s&quot; % voter.email)
@@ -790,7 +790,7 @@ The Helios Voting System
       full_body = message % (body, election.name, config.webroot + ('/elections/%s/trustees/%s/home' % (election.election_id, utils.urlencode(trustee.email))), trustee.password)
 
       # send out the emails for the shares
-      mail.simple_send([trustee.email],[trustee.email],&quot;Helios&quot;,&quot;system@heliosvoting.org&quot;, subject, full_body)
+      mail.simple_send([trustee.email],[trustee.email],&quot;Helios&quot;,&quot;ben@adida.net&quot;, subject, full_body)
     
     return &quot;DONE&quot;
     </diff>
      <filename>controllers/election.py</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>34f81b586dd133f8d92f8045a57753372b27ea50</id>
    </parent>
    <parent>
      <id>5b28107c50839c5fd519585ebeca2b3a314d5141</id>
    </parent>
  </parents>
  <author>
    <name>Ben Adida</name>
    <email>ben@adida.net</email>
  </author>
  <url>http://github.com/benadida/helios/commit/7c70284246b1ad38ab16ff7b1026af341ab3841f</url>
  <id>7c70284246b1ad38ab16ff7b1026af341ab3841f</id>
  <committed-date>2009-04-16T15:17:38-07:00</committed-date>
  <authored-date>2009-04-16T15:17:38-07:00</authored-date>
  <message>Merge branch 'master' of git@github.com:benadida/helios</message>
  <tree>28a77f0b924cdabb1e5155e63a4acb39fbc640dd</tree>
  <committer>
    <name>Ben Adida</name>
    <email>ben@adida.net</email>
  </committer>
</commit>
