From: Kai Krueger <kakrueger@gmail.com>
Date: Sat, 27 Feb 2010 11:21:15 +0000 (+0000)
Subject: merge 19889:20181 of rails_port into the openID branch
X-Git-Tag: live~7426
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/bbf30e76e4bfcd70e62fc84ecd32c5e494506e9e?hp=bbf30e76e4bfcd70e62fc84ecd32c5e494506e9e

merge 19889:20181 of rails_port into the openID branch

merge conflicts with the remember_me functionality
---