merge r17141:17256 from trunk
authorMatt Amos <zerebubuth@gmail.com>
Tue, 25 Aug 2009 16:49:52 +0000 (16:49 +0000)
committerMatt Amos <zerebubuth@gmail.com>
Tue, 25 Aug 2009 16:49:52 +0000 (16:49 +0000)
1  2 
app/views/user/login.html.erb

Simple merge