* master: (79 commits)
  Release 1.1.0.
  Tests green on mongoid as well.
  Update CHANGELOG.
  More about extend remember period feature.
  documentation tweaks for extend_remember_period
  Add extend_remember_period, closes #340.
  small documentation fix
  Warn in case you are using the previous session schema, closes #386
  Always loop before generating a token.
  Add filters as convenient default.
  Attributes for devise generator
  Consider ApplicationController url_options in for PathChecker.
  Save confirmation token to the database, if one does not exist but was requested, closes #377
  Fix docs about after_sign_in_path_for and routes
  Do not check the constant, otherwise class renaming will trigger errors as well.
  Store classes as string in session, to avoid serialization and stale data issues, closes #356
  Email should be case insensitive, closes #372
  Do not add unlock routes unless unlock strategy is email or both, closes #373
  Also pass stretches to salt generation.
  Use confirmed_at as flag.
  ...

Conflicts:
	Gemfile
	lib/generators/devise/devise/devise_generator.rb
	test/models/validatable_test.rb

* plataformatec/master: (42 commits)
  Updated the views generator to respect the rails :template_engine option.
  Add some tests to helper creation using namespaces, to better show how it works.
  Smallish update to README.
  Remove skipped handling from OAuth in favor of exceptions and rescue_from syntax.
  Add note to README about dm-devise project
  updated Gemfile.lock
  Gemfile works with JRuby 1.5.1, tests run
  Update CHANGELOG from branch.
  Fix generators bug.
  Register helper_methods on demand.
  Let's just include the test helpers for controller specs, not all specs.
  Presumed Markdown syntax - switching inline code to RDoc.
  Expanding on testing docs a little to be more useful for those using RSpec. ActionController::TestCase doesn't seem to be used in RSpec 2 - and besides, we want the setup method called so Warden is automatically initialised.
  Update README about OAuth2 support.
  Remove deprecated stuff, tag 1.2.0 as version.
  scope_signed_in? helpers now simply delegate to current_scope to improve performance.
  Improve docs for routes customization.
  Do not eager load all controllers. Otherwise this will force OAuth to be loaded.
  Improve TODO.
  Unit tests for OAuth.
  ...

Conflicts:
	Gemfile

* v1.1.0-mongomapper:
  mongomapper generator fix typo
  mongomapper generator
  add support for mongomapper at Badminus's fork
  Add sign_out_time in trackable module

* plataformatec/master:
  Update CHANGELOG.
  Ensure routes works for all rails 3 versions.
  Typo in initializer
  Small fix in the README.
  Add more docs to the cancel action.
  Changes the comments in devise initializer to reflect the default options.
  Disable HTTP Authentication by default. You can turn it on in the initializer.
  sign_out_all_scopes is true by default.
  Added Devise.sign_out_via.
  Update CHANGELOG.
  after_sign_in_path_for always receives a resource
  Update README.

Conflicts:
	Rakefile

Let's hope this works. Trying to figure out why shim stops working.