<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>merb-auth/.gitignore</filename>
    </added>
    <added>
      <filename>merb-auth/README.textile</filename>
    </added>
    <added>
      <filename>merb-auth/examples/example_app/Rakefile</filename>
    </added>
    <added>
      <filename>merb-auth/examples/example_app/app/controllers/application.rb</filename>
    </added>
    <added>
      <filename>merb-auth/examples/example_app/app/controllers/exceptions.rb</filename>
    </added>
    <added>
      <filename>merb-auth/examples/example_app/app/controllers/welcome.rb</filename>
    </added>
    <added>
      <filename>merb-auth/examples/example_app/app/helpers/global_helpers.rb</filename>
    </added>
    <added>
      <filename>merb-auth/examples/example_app/app/models/user.rb</filename>
    </added>
    <added>
      <filename>merb-auth/examples/example_app/app/views/exceptions/internal_server_error.html.erb</filename>
    </added>
    <added>
      <filename>merb-auth/examples/example_app/app/views/exceptions/not_acceptable.html.erb</filename>
    </added>
    <added>
      <filename>merb-auth/examples/example_app/app/views/exceptions/not_found.html.erb</filename>
    </added>
    <added>
      <filename>merb-auth/examples/example_app/app/views/exceptions/unauthenticated.html.erb</filename>
    </added>
    <added>
      <filename>merb-auth/examples/example_app/app/views/layout/application.html.erb</filename>
    </added>
    <added>
      <filename>merb-auth/examples/example_app/autotest/discover.rb</filename>
    </added>
    <added>
      <filename>merb-auth/examples/example_app/autotest/merb.rb</filename>
    </added>
    <added>
      <filename>merb-auth/examples/example_app/autotest/merb_rspec.rb</filename>
    </added>
    <added>
      <filename>merb-auth/examples/example_app/config/environments/development.rb</filename>
    </added>
    <added>
      <filename>merb-auth/examples/example_app/config/environments/production.rb</filename>
    </added>
    <added>
      <filename>merb-auth/examples/example_app/config/environments/rake.rb</filename>
    </added>
    <added>
      <filename>merb-auth/examples/example_app/config/environments/test.rb</filename>
    </added>
    <added>
      <filename>merb-auth/examples/example_app/config/init.rb</filename>
    </added>
    <added>
      <filename>merb-auth/examples/example_app/config/rack.rb</filename>
    </added>
    <added>
      <filename>merb-auth/examples/example_app/config/router.rb</filename>
    </added>
    <added>
      <filename>merb-auth/examples/example_app/lib/merb-auth_setup.rb</filename>
    </added>
    <added>
      <filename>merb-auth/examples/example_app/public/images/merb.jpg</filename>
    </added>
    <added>
      <filename>merb-auth/examples/example_app/public/merb.fcgi</filename>
    </added>
    <added>
      <filename>merb-auth/examples/example_app/public/slices/merb_auth_password_slice/javascripts/master.js</filename>
    </added>
    <added>
      <filename>merb-auth/examples/example_app/public/slices/merb_auth_password_slice/stylesheets/master.css</filename>
    </added>
    <added>
      <filename>merb-auth/examples/example_app/public/stylesheets/master.css</filename>
    </added>
    <added>
      <filename>merb-auth/examples/example_app/spec/spec.opts</filename>
    </added>
    <added>
      <filename>merb-auth/examples/example_app/spec/spec_helper.rb</filename>
    </added>
    <added>
      <filename>merb-auth/merb_auth-core/LICENSE</filename>
    </added>
    <added>
      <filename>merb-auth/merb_auth-core/README.textile</filename>
    </added>
    <added>
      <filename>merb-auth/merb_auth-core/Rakefile</filename>
    </added>
    <added>
      <filename>merb-auth/merb_auth-core/TODO</filename>
    </added>
    <added>
      <filename>merb-auth/merb_auth-core/lib/merb_auth-core.rb</filename>
    </added>
    <added>
      <filename>merb-auth/merb_auth-core/lib/merb_auth-core/authenticated_helper.rb</filename>
    </added>
    <added>
      <filename>merb-auth/merb_auth-core/lib/merb_auth-core/authentication.rb</filename>
    </added>
    <added>
      <filename>merb-auth/merb_auth-core/lib/merb_auth-core/errors.rb</filename>
    </added>
    <added>
      <filename>merb-auth/merb_auth-core/lib/merb_auth-core/merbtasks.rb</filename>
    </added>
    <added>
      <filename>merb-auth/merb_auth-core/lib/merb_auth-core/redirection.rb</filename>
    </added>
    <added>
      <filename>merb-auth/merb_auth-core/lib/merb_auth-core/session_mixin.rb</filename>
    </added>
    <added>
      <filename>merb-auth/merb_auth-core/lib/merb_auth-core/strategy.rb</filename>
    </added>
    <added>
      <filename>merb-auth/merb_auth-core/merb_auth-core.gemspec</filename>
    </added>
    <added>
      <filename>merb-auth/merb_auth-core/spec/helpers/authentication_helper_spec.rb</filename>
    </added>
    <added>
      <filename>merb-auth/merb_auth-core/spec/merb_auth-core/authentication_spec.rb</filename>
    </added>
    <added>
      <filename>merb-auth/merb_auth-core/spec/merb_auth-core/errors_spec.rb</filename>
    </added>
    <added>
      <filename>merb-auth/merb_auth-core/spec/merb_auth-core/merb_auth-core_spec.rb</filename>
    </added>
    <added>
      <filename>merb-auth/merb_auth-core/spec/merb_auth-core/strategy_spec.rb</filename>
    </added>
    <added>
      <filename>merb-auth/merb_auth-core/spec/spec_helper.rb</filename>
    </added>
    <added>
      <filename>merb-auth/merb_auth-more/LICENSE</filename>
    </added>
    <added>
      <filename>merb-auth/merb_auth-more/README.textile</filename>
    </added>
    <added>
      <filename>merb-auth/merb_auth-more/Rakefile</filename>
    </added>
    <added>
      <filename>merb-auth/merb_auth-more/TODO</filename>
    </added>
    <added>
      <filename>merb-auth/merb_auth-more/lib/merb_auth-more.rb</filename>
    </added>
    <added>
      <filename>merb-auth/merb_auth-more/lib/merb_auth-more/merbtasks.rb</filename>
    </added>
    <added>
      <filename>merb-auth/merb_auth-more/lib/merb_auth-more/mixins/redirect_back.rb</filename>
    </added>
    <added>
      <filename>merb-auth/merb_auth-more/lib/merb_auth-more/mixins/salted_user.rb</filename>
    </added>
    <added>
      <filename>merb-auth/merb_auth-more/lib/merb_auth-more/mixins/salted_user/ar_salted_user.rb</filename>
    </added>
    <added>
      <filename>merb-auth/merb_auth-more/lib/merb_auth-more/mixins/salted_user/dm_salted_user.rb</filename>
    </added>
    <added>
      <filename>merb-auth/merb_auth-more/lib/merb_auth-more/mixins/salted_user/sq_salted_user.rb</filename>
    </added>
    <added>
      <filename>merb-auth/merb_auth-more/lib/merb_auth-more/strategies/abstract_password.rb</filename>
    </added>
    <added>
      <filename>merb-auth/merb_auth-more/lib/merb_auth-more/strategies/basic/basic_auth.rb</filename>
    </added>
    <added>
      <filename>merb-auth/merb_auth-more/lib/merb_auth-more/strategies/basic/openid.rb</filename>
    </added>
    <added>
      <filename>merb-auth/merb_auth-more/lib/merb_auth-more/strategies/basic/password_form.rb</filename>
    </added>
    <added>
      <filename>merb-auth/merb_auth-more/merb_auth-more.gemspec</filename>
    </added>
    <added>
      <filename>merb-auth/merb_auth-more/spec/merb_auth-more_spec.rb</filename>
    </added>
    <added>
      <filename>merb-auth/merb_auth-more/spec/mixins/redirect_back_spec.rb</filename>
    </added>
    <added>
      <filename>merb-auth/merb_auth-more/spec/mixins/salted_user_spec.rb</filename>
    </added>
    <added>
      <filename>merb-auth/merb_auth-more/spec/spec_helper.rb</filename>
    </added>
    <added>
      <filename>merb-auth/slices/merb_auth_password_slice/LICENSE</filename>
    </added>
    <added>
      <filename>merb-auth/slices/merb_auth_password_slice/README.textile</filename>
    </added>
    <added>
      <filename>merb-auth/slices/merb_auth_password_slice/Rakefile</filename>
    </added>
    <added>
      <filename>merb-auth/slices/merb_auth_password_slice/TODO</filename>
    </added>
    <added>
      <filename>merb-auth/slices/merb_auth_password_slice/app/controllers/application.rb</filename>
    </added>
    <added>
      <filename>merb-auth/slices/merb_auth_password_slice/app/controllers/exceptions.rb</filename>
    </added>
    <added>
      <filename>merb-auth/slices/merb_auth_password_slice/app/controllers/sessions.rb</filename>
    </added>
    <added>
      <filename>merb-auth/slices/merb_auth_password_slice/app/helpers/application_helper.rb</filename>
    </added>
    <added>
      <filename>merb-auth/slices/merb_auth_password_slice/app/views/exceptions/unauthenticated.html.erb</filename>
    </added>
    <added>
      <filename>merb-auth/slices/merb_auth_password_slice/app/views/layout/merb_auth_password_slice.html.erb</filename>
    </added>
    <added>
      <filename>merb-auth/slices/merb_auth_password_slice/lib/merb_auth_password_slice.rb</filename>
    </added>
    <added>
      <filename>merb-auth/slices/merb_auth_password_slice/lib/merb_auth_password_slice/merbtasks.rb</filename>
    </added>
    <added>
      <filename>merb-auth/slices/merb_auth_password_slice/lib/merb_auth_password_slice/slicetasks.rb</filename>
    </added>
    <added>
      <filename>merb-auth/slices/merb_auth_password_slice/lib/merb_auth_password_slice/spectasks.rb</filename>
    </added>
    <added>
      <filename>merb-auth/slices/merb_auth_password_slice/merb_auth_password_slice.gemspec</filename>
    </added>
    <added>
      <filename>merb-auth/slices/merb_auth_password_slice/public/javascripts/master.js</filename>
    </added>
    <added>
      <filename>merb-auth/slices/merb_auth_password_slice/public/stylesheets/master.css</filename>
    </added>
    <added>
      <filename>merb-auth/slices/merb_auth_password_slice/spec/controllers/main_spec.rb</filename>
    </added>
    <added>
      <filename>merb-auth/slices/merb_auth_password_slice/spec/merb_auth_password_slice_spec.rb</filename>
    </added>
    <added>
      <filename>merb-auth/slices/merb_auth_password_slice/spec/spec_helper.rb</filename>
    </added>
    <added>
      <filename>merb-auth/slices/merb_auth_password_slice/stubs/app/controllers/application.rb</filename>
    </added>
    <added>
      <filename>merb-auth/slices/merb_auth_password_slice/stubs/app/controllers/main.rb</filename>
    </added>
    <added>
      <filename>merb-exceptions/.gitignore</filename>
    </added>
    <added>
      <filename>merb-exceptions/HISTORY</filename>
    </added>
    <added>
      <filename>merb-exceptions/LICENSE</filename>
    </added>
    <added>
      <filename>merb-exceptions/README.markdown</filename>
    </added>
    <added>
      <filename>merb-exceptions/Rakefile</filename>
    </added>
    <added>
      <filename>merb-exceptions/lib/merb_exceptions.rb</filename>
    </added>
    <added>
      <filename>merb-exceptions/lib/merb_exceptions/controller_extensions.rb</filename>
    </added>
    <added>
      <filename>merb-exceptions/lib/merb_exceptions/notification.rb</filename>
    </added>
    <added>
      <filename>merb-exceptions/lib/merb_exceptions/templates/email.erb</filename>
    </added>
    <added>
      <filename>merb-exceptions/merb_exceptions.gemspec</filename>
    </added>
    <added>
      <filename>merb-exceptions/spec/notification_spec.rb</filename>
    </added>
    <added>
      <filename>merb-exceptions/spec/spec_helper.rb</filename>
    </added>
  </added>
  <modified type="array"/>
  <removed type="array">
    <removed>
      <filename>merb-builder/LICENSE</filename>
    </removed>
    <removed>
      <filename>merb-builder/README</filename>
    </removed>
    <removed>
      <filename>merb-builder/Rakefile</filename>
    </removed>
    <removed>
      <filename>merb-builder/TODO</filename>
    </removed>
    <removed>
      <filename>merb-builder/lib/merb-builder.rb</filename>
    </removed>
    <removed>
      <filename>merb-builder/lib/merb-builder/template.rb</filename>
    </removed>
    <removed>
      <filename>merb-builder/spec/builder_spec.rb</filename>
    </removed>
    <removed>
      <filename>merb-builder/spec/controllers/builder.rb</filename>
    </removed>
    <removed>
      <filename>merb-builder/spec/controllers/views/builder_config/index.xml.builder</filename>
    </removed>
    <removed>
      <filename>merb-builder/spec/controllers/views/builder_controller/index.xml.builder</filename>
    </removed>
    <removed>
      <filename>merb-builder/spec/controllers/views/capture_builder/index.xml.builder</filename>
    </removed>
    <removed>
      <filename>merb-builder/spec/controllers/views/concat_builder/index.xml.builder</filename>
    </removed>
    <removed>
      <filename>merb-builder/spec/controllers/views/partial_builder/_partial_builder.xml.builder</filename>
    </removed>
    <removed>
      <filename>merb-builder/spec/controllers/views/partial_builder/index.xml.builder</filename>
    </removed>
    <removed>
      <filename>merb-builder/spec/controllers/views/partial_ivars/_partial_builder.xml.builder</filename>
    </removed>
    <removed>
      <filename>merb-builder/spec/controllers/views/partial_ivars/index.xml.builder</filename>
    </removed>
    <removed>
      <filename>merb-builder/spec/spec_helper.rb</filename>
    </removed>
    <removed>
      <filename>merb-jquery/LICENSE</filename>
    </removed>
    <removed>
      <filename>merb-jquery/README</filename>
    </removed>
    <removed>
      <filename>merb-jquery/Rakefile</filename>
    </removed>
    <removed>
      <filename>merb-jquery/TODO</filename>
    </removed>
    <removed>
      <filename>merb-jquery/lib/merb-jquery.rb</filename>
    </removed>
    <removed>
      <filename>merb-jquery/lib/merb-jquery/merbtasks.rb</filename>
    </removed>
    <removed>
      <filename>merb-parts/LICENSE</filename>
    </removed>
    <removed>
      <filename>merb-parts/README</filename>
    </removed>
    <removed>
      <filename>merb-parts/Rakefile</filename>
    </removed>
    <removed>
      <filename>merb-parts/TODO</filename>
    </removed>
    <removed>
      <filename>merb-parts/lib/merb-parts.rb</filename>
    </removed>
    <removed>
      <filename>merb-parts/lib/merb-parts/merbtasks.rb</filename>
    </removed>
    <removed>
      <filename>merb-parts/lib/merb-parts/mixins/parts_mixin.rb</filename>
    </removed>
    <removed>
      <filename>merb-parts/lib/merb-parts/mixins/web_controller.rb</filename>
    </removed>
    <removed>
      <filename>merb-parts/lib/merb-parts/part_controller.rb</filename>
    </removed>
    <removed>
      <filename>merb-parts/spec/fixtures/controllers/main.rb</filename>
    </removed>
    <removed>
      <filename>merb-parts/spec/fixtures/parts/done_part.rb</filename>
    </removed>
    <removed>
      <filename>merb-parts/spec/fixtures/parts/todo_part.rb</filename>
    </removed>
    <removed>
      <filename>merb-parts/spec/fixtures/parts/views/layout/todo_part.html.erb</filename>
    </removed>
    <removed>
      <filename>merb-parts/spec/fixtures/parts/views/layout/todo_part.xml.erb</filename>
    </removed>
    <removed>
      <filename>merb-parts/spec/fixtures/parts/views/todo_part/formatted_output.html.erb</filename>
    </removed>
    <removed>
      <filename>merb-parts/spec/fixtures/parts/views/todo_part/formatted_output.js.erb</filename>
    </removed>
    <removed>
      <filename>merb-parts/spec/fixtures/parts/views/todo_part/formatted_output.xml.erb</filename>
    </removed>
    <removed>
      <filename>merb-parts/spec/fixtures/parts/views/todo_part/list.html.erb</filename>
    </removed>
    <removed>
      <filename>merb-parts/spec/fixtures/parts/views/todo_part/part_with_params.html.erb</filename>
    </removed>
    <removed>
      <filename>merb-parts/spec/fixtures/views/main/part_within_view.html.erb</filename>
    </removed>
    <removed>
      <filename>merb-parts/spec/merb-parts_spec.rb</filename>
    </removed>
    <removed>
      <filename>merb-parts/spec/spec_helper.rb</filename>
    </removed>
  </removed>
  <parents type="array">
    <parent>
      <id>ee7805ae934b6cecf2d5c2059f1b81e8d3711cff</id>
    </parent>
  </parents>
  <author>
    <name>Yehuda Katz</name>
    <email>wycats@gmail.com</email>
  </author>
  <url>http://github.com/wycats/merb/commit/6c740834c1d9b4ce3f9a95d14c1f9234f253f569</url>
  <id>6c740834c1d9b4ce3f9a95d14c1f9234f253f569</id>
  <committed-date>2008-10-08T15:02:26-07:00</committed-date>
  <authored-date>2008-10-08T12:59:09-07:00</authored-date>
  <message>Move things to merb-more</message>
  <tree>2cef48dd8c64718f454ecb1d206f9a7ed5564737</tree>
  <committer>
    <name>Yehuda Katz</name>
    <email>wycats@gmail.com</email>
  </committer>
</commit>
