]> projects.mako.cc - selectricity/commitdiff
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

diff --cc README
Simple merge

Benjamin Mako Hill || Want to submit a patch?