Merge 18123:18249 from trunk.
authorTom Hughes <tom@compton.nu>
Wed, 21 Oct 2009 23:37:05 +0000 (23:37 +0000)
committerTom Hughes <tom@compton.nu>
Wed, 21 Oct 2009 23:37:05 +0000 (23:37 +0000)
commit0166abe88a2c082500f208d6f6be1343e6d0bedd
tree819bd07efd4abc934535b58ce41d321ece4eecbb
parentd4b802075753bfc7110162ad28eebfbd20f91c7b
parent6ce5986a5229408757cfdccaed3d5995376b0511
Merge 18123:18249 from trunk.
app/views/layouts/site.html.erb
app/views/user/new.html.erb