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)
commitc6bf21a9d054f29d788272767b7a77d58fe56aec
treee4d6451f5792497f11abfa3e6b5802706c8c4946
parent498832eb372d260cc12ac7037ef278a4652d34bc
parentb34b89845122aff079af055f5adfc909c1e6ac9e
merge r17141:17256 from trunk
app/views/user/login.html.erb