merge everything back from mainline branch

[selectricity] / app / models / voter.rb

diff --git a/app/models/voter.rb b/app/models/voter.rb
index 012c795a075279e68fd362a51f3f376056695d74..3a268f74427239f9654b928871b90aaf3e749807 100644 (file)
--- a/app/models/voter.rb
+++ b/app/models/voter.rb
@@ -1,3 +1,10 @@
+# Selectricity: Voting Machinery for the Masses
+# Copyright (C) 2007, 2008 Benjamin Mako Hill <mako@atdot.cc>
+# Copyright (C) 2007 Massachusetts Institute of Technology
+#
+# This program is free software. Please see the COPYING file for
+# details.
+

 class Voter < ActiveRecord::Base
   belongs_to :election
   has_one :vote
 class Voter < ActiveRecord::Base
   belongs_to :election
   has_one :vote