From: Benjamin Mako Hill <mako@atdot.cc>
Date: Sun, 17 Jun 2012 22:59:36 +0000 (-0400)
Subject: Merge branch 'live' of ssh://ephesus.xvm.mit.edu/org/selectricity/selectricity-live
X-Git-Url: https://projects.mako.cc/source/selectricity/commitdiff_plain/005f5a86085c9cbcbc09c6655f3851a877462638?hp=005f5a86085c9cbcbc09c6655f3851a877462638

Merge branch 'live' of ssh://ephesus.xvm.mit.edu/org/selectricity/selectricity-live

Conflicts:
	README
	app/controllers/voter_controller.rb
	app/views/layouts/_footer.rhtml
---