Merge 17130 from trunk.
authorTom Hughes <tom@compton.nu>
Tue, 13 Oct 2009 20:27:38 +0000 (20:27 +0000)
committerTom Hughes <tom@compton.nu>
Tue, 13 Oct 2009 20:27:38 +0000 (20:27 +0000)
1  2 
app/views/site/edit.html.erb

Simple merge