Merge from head -- breakage
[selectricity-live] / public / images / rails.png
public/images/rails.png

Benjamin Mako Hill || Want to submit a patch?