]> projects.mako.cc - selectricity/commitdiff
projects / selectricity / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8bc8be2 2fed9b6)
Merge remote branch 'deployment/live' into live
authorBenjamin Mako Hill <mako@atdot.cc>
Mon, 6 Sep 2010 18:09:20 +0000 (14:09 -0400)
committerBenjamin Mako Hill <mako@atdot.cc>
Mon, 6 Sep 2010 18:09:20 +0000 (14:09 -0400)
1  2 
README patch | diff1 | diff2 | blob | history

diff --cc README
Simple merge
Voting machinery for the masses!

Benjamin Mako Hill || Want to submit a patch?