Merge from head
authorJohn Dong <jdong@mit.edu>
Mon, 20 Aug 2007 21:32:37 +0000 (17:32 -0400)
committerJohn Dong <jdong@mit.edu>
Mon, 20 Aug 2007 21:32:37 +0000 (17:32 -0400)
1  2 
app/views/quickvote/_pref_table.rhtml
app/views/quickvote/results.rhtml

Simple merge
Simple merge

Benjamin Mako Hill || Want to submit a patch?