José Valim 6d681c5b8a Merge remote-tracking branch 'heimidal/updates' into reconfirm ... Conflicts: lib/devise/models/confirmable.rb test/support/helpers.rb		2011-12-04 20:58:41 +01:00
..
en.yml	Merge remote-tracking branch 'heimidal/updates' into reconfirm	2011-12-04 20:58:41 +01:00