<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -1,3 +1,5 @@
 h1. MerbAuth - Merb Authentication
 
-Has moved to &quot;http://github.com/wycats/merb-plugins/tree/master/merb_auth&quot;:http://github.com/wycats/merb-plugins/tree/master/merb_auth
\ No newline at end of file
+Has moved to &quot;http://github.com/wycats/merb/tree/master/merb-auth&quot;:http://github.com/wycats/merb/tree/master/merb-auth
+
+The old slice version of merb-auth is now in my merbful_authentication repository.  This is not maintained.
\ No newline at end of file</diff>
      <filename>README.textile</filename>
    </modified>
  </modified>
  <removed type="array">
    <removed>
      <filename>examples/example_app/Rakefile</filename>
    </removed>
    <removed>
      <filename>examples/example_app/app/controllers/application.rb</filename>
    </removed>
    <removed>
      <filename>examples/example_app/app/controllers/exceptions.rb</filename>
    </removed>
    <removed>
      <filename>examples/example_app/app/controllers/welcome.rb</filename>
    </removed>
    <removed>
      <filename>examples/example_app/app/helpers/global_helpers.rb</filename>
    </removed>
    <removed>
      <filename>examples/example_app/app/models/user.rb</filename>
    </removed>
    <removed>
      <filename>examples/example_app/app/views/exceptions/internal_server_error.html.erb</filename>
    </removed>
    <removed>
      <filename>examples/example_app/app/views/exceptions/not_acceptable.html.erb</filename>
    </removed>
    <removed>
      <filename>examples/example_app/app/views/exceptions/not_found.html.erb</filename>
    </removed>
    <removed>
      <filename>examples/example_app/app/views/exceptions/unauthenticated.html.erb</filename>
    </removed>
    <removed>
      <filename>examples/example_app/app/views/layout/application.html.erb</filename>
    </removed>
    <removed>
      <filename>examples/example_app/autotest/discover.rb</filename>
    </removed>
    <removed>
      <filename>examples/example_app/autotest/merb.rb</filename>
    </removed>
    <removed>
      <filename>examples/example_app/autotest/merb_rspec.rb</filename>
    </removed>
    <removed>
      <filename>examples/example_app/config/environments/development.rb</filename>
    </removed>
    <removed>
      <filename>examples/example_app/config/environments/production.rb</filename>
    </removed>
    <removed>
      <filename>examples/example_app/config/environments/rake.rb</filename>
    </removed>
    <removed>
      <filename>examples/example_app/config/environments/test.rb</filename>
    </removed>
    <removed>
      <filename>examples/example_app/config/init.rb</filename>
    </removed>
    <removed>
      <filename>examples/example_app/config/rack.rb</filename>
    </removed>
    <removed>
      <filename>examples/example_app/config/router.rb</filename>
    </removed>
    <removed>
      <filename>examples/example_app/lib/merb-auth_setup.rb</filename>
    </removed>
    <removed>
      <filename>examples/example_app/public/images/merb.jpg</filename>
    </removed>
    <removed>
      <filename>examples/example_app/public/merb.fcgi</filename>
    </removed>
    <removed>
      <filename>examples/example_app/public/slices/mauth_password_slice/javascripts/master.js</filename>
    </removed>
    <removed>
      <filename>examples/example_app/public/slices/mauth_password_slice/stylesheets/master.css</filename>
    </removed>
    <removed>
      <filename>examples/example_app/public/stylesheets/master.css</filename>
    </removed>
    <removed>
      <filename>examples/example_app/spec/spec.opts</filename>
    </removed>
    <removed>
      <filename>examples/example_app/spec/spec_helper.rb</filename>
    </removed>
    <removed>
      <filename>examples/example_app/test/test_helper.rb</filename>
    </removed>
    <removed>
      <filename>merb-auth-core/LICENSE</filename>
    </removed>
    <removed>
      <filename>merb-auth-core/README.textile</filename>
    </removed>
    <removed>
      <filename>merb-auth-core/Rakefile</filename>
    </removed>
    <removed>
      <filename>merb-auth-core/TODO</filename>
    </removed>
    <removed>
      <filename>merb-auth-core/lib/merb-auth-core.rb</filename>
    </removed>
    <removed>
      <filename>merb-auth-core/lib/merb-auth-core/authenticated_helper.rb</filename>
    </removed>
    <removed>
      <filename>merb-auth-core/lib/merb-auth-core/authentication.rb</filename>
    </removed>
    <removed>
      <filename>merb-auth-core/lib/merb-auth-core/errors.rb</filename>
    </removed>
    <removed>
      <filename>merb-auth-core/lib/merb-auth-core/merbtasks.rb</filename>
    </removed>
    <removed>
      <filename>merb-auth-core/lib/merb-auth-core/session_mixin.rb</filename>
    </removed>
    <removed>
      <filename>merb-auth-core/lib/merb-auth-core/strategy.rb</filename>
    </removed>
    <removed>
      <filename>merb-auth-core/spec/helpers/authentication_helper_spec.rb</filename>
    </removed>
    <removed>
      <filename>merb-auth-core/spec/merb-auth-core/authentication_spec.rb</filename>
    </removed>
    <removed>
      <filename>merb-auth-core/spec/merb-auth-core/errors_spec.rb</filename>
    </removed>
    <removed>
      <filename>merb-auth-core/spec/merb-auth-core/merb-auth-core_spec.rb</filename>
    </removed>
    <removed>
      <filename>merb-auth-core/spec/merb-auth-core/strategy_spec.rb</filename>
    </removed>
    <removed>
      <filename>merb-auth-core/spec/spec_helper.rb</filename>
    </removed>
    <removed>
      <filename>merb-auth-more/LICENSE</filename>
    </removed>
    <removed>
      <filename>merb-auth-more/README.textile</filename>
    </removed>
    <removed>
      <filename>merb-auth-more/Rakefile</filename>
    </removed>
    <removed>
      <filename>merb-auth-more/TODO</filename>
    </removed>
    <removed>
      <filename>merb-auth-more/lib/merb-auth-more.rb</filename>
    </removed>
    <removed>
      <filename>merb-auth-more/lib/merb-auth-more/merbtasks.rb</filename>
    </removed>
    <removed>
      <filename>merb-auth-more/lib/merb-auth-more/mixins/redirect_back.rb</filename>
    </removed>
    <removed>
      <filename>merb-auth-more/lib/merb-auth-more/mixins/salted_user.rb</filename>
    </removed>
    <removed>
      <filename>merb-auth-more/lib/merb-auth-more/mixins/salted_user/ar_salted_user.rb</filename>
    </removed>
    <removed>
      <filename>merb-auth-more/lib/merb-auth-more/mixins/salted_user/dm_salted_user.rb</filename>
    </removed>
    <removed>
      <filename>merb-auth-more/lib/merb-auth-more/strategies/abstract_password.rb</filename>
    </removed>
    <removed>
      <filename>merb-auth-more/lib/merb-auth-more/strategies/basic/basic_auth.rb</filename>
    </removed>
    <removed>
      <filename>merb-auth-more/lib/merb-auth-more/strategies/basic/openid.rb</filename>
    </removed>
    <removed>
      <filename>merb-auth-more/lib/merb-auth-more/strategies/basic/password_form.rb</filename>
    </removed>
    <removed>
      <filename>merb-auth-more/spec/merb-auth-more_spec.rb</filename>
    </removed>
    <removed>
      <filename>merb-auth-more/spec/mixins/redirect_back_spec.rb</filename>
    </removed>
    <removed>
      <filename>merb-auth-more/spec/mixins/salted_user_spec.rb</filename>
    </removed>
    <removed>
      <filename>merb-auth-more/spec/spec_helper.rb</filename>
    </removed>
    <removed>
      <filename>slices/merb-auth_password_slice/LICENSE</filename>
    </removed>
    <removed>
      <filename>slices/merb-auth_password_slice/README.textile</filename>
    </removed>
    <removed>
      <filename>slices/merb-auth_password_slice/Rakefile</filename>
    </removed>
    <removed>
      <filename>slices/merb-auth_password_slice/TODO</filename>
    </removed>
    <removed>
      <filename>slices/merb-auth_password_slice/app/controllers/application.rb</filename>
    </removed>
    <removed>
      <filename>slices/merb-auth_password_slice/app/controllers/exceptions.rb</filename>
    </removed>
    <removed>
      <filename>slices/merb-auth_password_slice/app/controllers/sessions.rb</filename>
    </removed>
    <removed>
      <filename>slices/merb-auth_password_slice/app/helpers/application_helper.rb</filename>
    </removed>
    <removed>
      <filename>slices/merb-auth_password_slice/app/views/exceptions/unauthenticated.html.erb</filename>
    </removed>
    <removed>
      <filename>slices/merb-auth_password_slice/app/views/layout/mauth_password_slice.html.erb</filename>
    </removed>
    <removed>
      <filename>slices/merb-auth_password_slice/lib/merb-auth_password_slice.rb</filename>
    </removed>
    <removed>
      <filename>slices/merb-auth_password_slice/lib/merb-auth_password_slice/merbtasks.rb</filename>
    </removed>
    <removed>
      <filename>slices/merb-auth_password_slice/lib/merb-auth_password_slice/slicetasks.rb</filename>
    </removed>
    <removed>
      <filename>slices/merb-auth_password_slice/lib/merb-auth_password_slice/spectasks.rb</filename>
    </removed>
    <removed>
      <filename>slices/merb-auth_password_slice/public/javascripts/master.js</filename>
    </removed>
    <removed>
      <filename>slices/merb-auth_password_slice/public/stylesheets/master.css</filename>
    </removed>
    <removed>
      <filename>slices/merb-auth_password_slice/spec/controllers/main_spec.rb</filename>
    </removed>
    <removed>
      <filename>slices/merb-auth_password_slice/spec/mauth_password_slice_spec.rb</filename>
    </removed>
    <removed>
      <filename>slices/merb-auth_password_slice/spec/spec_helper.rb</filename>
    </removed>
    <removed>
      <filename>slices/merb-auth_password_slice/stubs/app/controllers/application.rb</filename>
    </removed>
    <removed>
      <filename>slices/merb-auth_password_slice/stubs/app/controllers/main.rb</filename>
    </removed>
  </removed>
  <parents type="array">
    <parent>
      <id>0d1e28ee7db67b6a2c2b98956e9aa262fd1a2a60</id>
    </parent>
  </parents>
  <author>
    <name>Daniel Neighman</name>
    <email>has.sox@gmail.com</email>
  </author>
  <url>http://github.com/hassox/merb-auth/commit/68dc81c516036c22f90225b9273b859746a45d5b</url>
  <id>68dc81c516036c22f90225b9273b859746a45d5b</id>
  <committed-date>2008-10-26T18:35:01-07:00</committed-date>
  <authored-date>2008-10-26T18:35:01-07:00</authored-date>
  <message>Complete the move over to the merb repo</message>
  <tree>69c4a177ae40952f7482bd4eb1ac6a18589710e0</tree>
  <committer>
    <name>Daniel Neighman</name>
    <email>has.sox@gmail.com</email>
  </committer>
</commit>
