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)
commit3244635aa11878135a014cf2c9ec9177f8e9d0ba
tree96c6f05b9bbce44174a5888a5afc183d626f6eff
parenteb0f9ff63d5ad5d91ea941420e094dd2980df094
parent1f007b289c0597a098166c9327edca7d990c9e4e
Merge 17130 from trunk.
app/views/site/edit.html.erb