merge everything back from mainline branch

[selectricity] / app / models / user.rb

diff --git a/app/models/user.rb b/app/models/user.rb
index 728ca164eee7fa87868f6fdb5fe1ba749440bcf5..17fe702332970e51b7f1ecacb3e0627e70feb312 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.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.
+
 require 'digest/sha1'
 class User < ActiveRecord::Base
   has_many :elections