<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>framework/merb-core/LICENSE</filename>
    </added>
    <added>
      <filename>framework/merb-core/README</filename>
    </added>
    <added>
      <filename>framework/merb-core/Rakefile</filename>
    </added>
    <added>
      <filename>framework/merb-core/TODO</filename>
    </added>
    <added>
      <filename>framework/merb-core/bin/merb</filename>
    </added>
    <added>
      <filename>framework/merb-core/bin/merb-specs</filename>
    </added>
    <added>
      <filename>framework/merb-core/docs/bootloading.dox</filename>
    </added>
    <added>
      <filename>framework/merb-core/docs/documentation_standards</filename>
    </added>
    <added>
      <filename>framework/merb-core/docs/new_render_api</filename>
    </added>
    <added>
      <filename>framework/merb-core/lib/merb-core.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/lib/merb-core/autoload.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/lib/merb-core/bootloader.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/lib/merb-core/config.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/lib/merb-core/constants.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/lib/merb-core/controller/abstract_controller.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/lib/merb-core/controller/exceptions.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/lib/merb-core/controller/merb_controller.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/lib/merb-core/controller/mime.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/lib/merb-core/controller/mixins/controller.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/lib/merb-core/controller/mixins/render.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/lib/merb-core/controller/mixins/responder.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/lib/merb-core/controller/template.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/lib/merb-core/core_ext.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/lib/merb-core/core_ext/class.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/lib/merb-core/core_ext/hash.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/lib/merb-core/core_ext/kernel.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/lib/merb-core/core_ext/mash.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/lib/merb-core/core_ext/object.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/lib/merb-core/core_ext/object_space.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/lib/merb-core/core_ext/rubygems.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/lib/merb-core/core_ext/set.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/lib/merb-core/core_ext/string.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/lib/merb-core/dispatch/cookies.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/lib/merb-core/dispatch/dispatcher.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/lib/merb-core/dispatch/exceptions.html.erb</filename>
    </added>
    <added>
      <filename>framework/merb-core/lib/merb-core/dispatch/request.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/lib/merb-core/dispatch/router.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/lib/merb-core/dispatch/router/behavior.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/lib/merb-core/dispatch/router/cached_proc.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/lib/merb-core/dispatch/router/route.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/lib/merb-core/dispatch/session.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/lib/merb-core/dispatch/session/cookie.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/lib/merb-core/dispatch/session/memcached.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/lib/merb-core/dispatch/session/memory.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/lib/merb-core/gem_ext/erubis.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/lib/merb-core/logger.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/lib/merb-core/plugins.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/lib/merb-core/rack.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/lib/merb-core/rack/adapter.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/lib/merb-core/rack/adapter/ebb.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/lib/merb-core/rack/adapter/evented_mongrel.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/lib/merb-core/rack/adapter/fcgi.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/lib/merb-core/rack/adapter/irb.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/lib/merb-core/rack/adapter/mongrel.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/lib/merb-core/rack/adapter/runner.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/lib/merb-core/rack/adapter/thin.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/lib/merb-core/rack/adapter/webrick.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/lib/merb-core/rack/application.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/lib/merb-core/rack/handler/mongrel.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/lib/merb-core/server.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/lib/merb-core/test.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/lib/merb-core/test/helpers.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/lib/merb-core/test/helpers/controller_helper.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/lib/merb-core/test/helpers/multipart_request_helper.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/lib/merb-core/test/helpers/request_helper.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/lib/merb-core/test/helpers/route_helper.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/lib/merb-core/test/helpers/view_helper.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/lib/merb-core/test/matchers.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/lib/merb-core/test/matchers/controller_matchers.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/lib/merb-core/test/matchers/route_matchers.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/lib/merb-core/test/matchers/view_matchers.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/lib/merb-core/test/run_specs.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/lib/merb-core/test/tasks/spectasks.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/lib/merb-core/test/test_ext/hpricot.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/lib/merb-core/test/test_ext/object.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/lib/merb-core/vendor/facets.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/lib/merb-core/vendor/facets/dictionary.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/lib/merb-core/vendor/facets/inflect.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/lib/merb-core/version.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/private/config/adapter_spec.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/private/config/config_spec.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/private/config/environment_spec.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/private/config/spec_helper.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/private/core_ext/hash_spec.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/private/core_ext/kernel_spec.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/private/core_ext/object_spec.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/private/core_ext/set_spec.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/private/core_ext/string_spec.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/private/dispatch/cookies_spec.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/private/dispatch/dispatch_spec.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/private/dispatch/fixture/app/controllers/application.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/private/dispatch/fixture/app/controllers/exceptions.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/private/dispatch/fixture/app/controllers/foo.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/private/dispatch/fixture/app/helpers/global_helpers.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/private/dispatch/fixture/app/views/exeptions/client_error.html.erb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/private/dispatch/fixture/app/views/exeptions/internal_server_error.html.erb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/private/dispatch/fixture/app/views/exeptions/not_acceptable.html.erb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/private/dispatch/fixture/app/views/exeptions/not_found.html.erb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/private/dispatch/fixture/app/views/foo/bar.html.erb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/private/dispatch/fixture/app/views/layout/application.html.erb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/private/dispatch/fixture/config/environments/development.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/private/dispatch/fixture/config/environments/production.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/private/dispatch/fixture/config/environments/test.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/private/dispatch/fixture/config/init.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/private/dispatch/fixture/config/rack.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/private/dispatch/fixture/config/router.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/private/dispatch/fixture/log/merb.4000.pid</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/private/dispatch/fixture/merb.4000.pid</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/private/dispatch/fixture/public/images/merb.jpg</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/private/dispatch/fixture/public/merb.fcgi</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/private/dispatch/fixture/public/stylesheets/master.css</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/private/dispatch/route_params_spec.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/private/dispatch/spec_helper.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/private/plugins/plugin_spec.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/private/rack/application_spec.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/DEFINITIONS</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/abstract_controller/controllers/alt_views/layout/application.erb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/abstract_controller/controllers/alt_views/layout/merb/test/fixtures/abstract/render_string_controller_layout.erb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/abstract_controller/controllers/alt_views/layout/merb/test/fixtures/abstract/render_template_controller_layout.erb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/abstract_controller/controllers/alt_views/merb/test/fixtures/abstract/display_object_with_multiple_roots/index.erb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/abstract_controller/controllers/alt_views/merb/test/fixtures/abstract/display_object_with_multiple_roots/show.erb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/abstract_controller/controllers/alt_views/merb/test/fixtures/abstract/render_template_multiple_roots/index.erb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/abstract_controller/controllers/alt_views/partial/basic_partial_with_multiple_roots/_partial.erb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/abstract_controller/controllers/alt_views/render_template_multiple_roots_and_custom_location/index.erb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/abstract_controller/controllers/alt_views/render_template_multiple_roots_inherited/index.erb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/abstract_controller/controllers/display.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/abstract_controller/controllers/filters.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/abstract_controller/controllers/helpers.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/abstract_controller/controllers/partial.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/abstract_controller/controllers/render.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/abstract_controller/controllers/views/helpers/capture/index.erb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/abstract_controller/controllers/views/helpers/concat/index.erb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/abstract_controller/controllers/views/layout/alt.erb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/abstract_controller/controllers/views/layout/custom.erb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/display_object/index.erb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/display_object_with_action/new.erb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/render_template/index.erb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/render_template_app_layout/index.erb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/render_template_custom_layout/index.erb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/render_template_multiple_roots/index.erb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/render_template_multiple_roots/show.erb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/abstract_controller/controllers/views/partial/another_directory/_partial.erb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/abstract_controller/controllers/views/partial/basic_partial/_partial.erb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/abstract_controller/controllers/views/partial/basic_partial/index.erb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/abstract_controller/controllers/views/partial/basic_partial_with_multiple_roots/index.erb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/abstract_controller/controllers/views/partial/nested_partial/_first.erb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/abstract_controller/controllers/views/partial/nested_partial/_second.erb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/abstract_controller/controllers/views/partial/nested_partial/index.erb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/abstract_controller/controllers/views/partial/partial_in_another_directory/index.erb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/abstract_controller/controllers/views/partial/partial_with_both/_collection.erb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/abstract_controller/controllers/views/partial/partial_with_both/index.erb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/abstract_controller/controllers/views/partial/partial_with_collections/_collection.erb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/abstract_controller/controllers/views/partial/partial_with_collections/index.erb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/abstract_controller/controllers/views/partial/partial_with_collections_and_as/_collection.erb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/abstract_controller/controllers/views/partial/partial_with_collections_and_as/index.erb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/abstract_controller/controllers/views/partial/partial_with_locals/_variables.erb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/abstract_controller/controllers/views/partial/partial_with_locals/index.erb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/abstract_controller/controllers/views/partial/partial_with_with_and_locals/_both.erb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/abstract_controller/controllers/views/partial/partial_with_with_and_locals/index.erb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/abstract_controller/controllers/views/partial/with_as_partial/_with_partial.erb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/abstract_controller/controllers/views/partial/with_as_partial/index.erb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/abstract_controller/controllers/views/partial/with_nil_partial/_with_partial.erb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/abstract_controller/controllers/views/partial/with_nil_partial/index.erb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/abstract_controller/controllers/views/partial/with_partial/_with_partial.erb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/abstract_controller/controllers/views/partial/with_partial/index.erb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/abstract_controller/controllers/views/test_display/foo.html.erb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/abstract_controller/controllers/views/test_render/foo.html.erb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/abstract_controller/controllers/views/wonderful/index.erb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/abstract_controller/display_spec.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/abstract_controller/filter_spec.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/abstract_controller/helper_spec.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/abstract_controller/partial_spec.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/abstract_controller/render_spec.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/abstract_controller/spec_helper.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/boot_loader/boot_loader_spec.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/boot_loader/spec_helper.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/controller/base_spec.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/controller/controllers/base.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/controller/controllers/display.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/controller/controllers/responder.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/controller/controllers/url.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/controller/controllers/views/layout/custom.html.erb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/controller/controllers/views/merb/test/fixtures/controllers/class_provides/index.html.erb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/controller/controllers/views/merb/test/fixtures/controllers/class_provides/index.xml.erb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/controller/controllers/views/merb/test/fixtures/controllers/display_with_template/index.html.erb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/controller/controllers/views/merb/test/fixtures/controllers/html_default/index.html.erb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/controller/controllers/views/merb/test/fixtures/controllers/layout/custom.html.erb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/controller/controllers/views/merb/test/fixtures/controllers/local_provides/index.html.erb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/controller/controllers/views/merb/test/fixtures/controllers/local_provides/index.xml.erb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/controller/controllers/views/merb/test/fixtures/controllers/multi_provides/index.html.erb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/controller/controllers/views/merb/test/fixtures/controllers/multi_provides/index.js.erb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/controller/display_spec.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/controller/log/merb.4000.pid</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/controller/responder_spec.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/controller/spec_helper.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/controller/url_spec.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/directory_structure/directory/app/controllers/application.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/directory_structure/directory/app/controllers/base.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/directory_structure/directory/app/controllers/custom.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/directory_structure/directory/app/views/base/template.html.erb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/directory_structure/directory/app/views/wonderful/template.erb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/directory_structure/directory/config/router.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/directory_structure/directory/log/merb.4000.pid</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/directory_structure/directory/merb.4000.pid</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/directory_structure/directory_spec.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/logger/logger_spec.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/logger/spec_helper.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/reloading/directory/app/controllers/application.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/reloading/directory/app/controllers/reload.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/reloading/directory/config/init.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/reloading/directory/log/merb.4000.pid</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/reloading/directory/merb.4000.pid</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/reloading/reload_spec.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/request/multipart_spec.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/request/request_spec.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/router/default_spec.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/router/deferred_spec.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/router/namespace_spec.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/router/nested_resources_spec.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/router/resource_spec.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/router/resources_spec.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/router/spec_helper.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/router/special_spec.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/router/string_spec.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/template/template_spec.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/template/templates/error.html.erb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/template/templates/template.html.erb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/template/templates/template.html.myt</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/test/controller_matchers_spec.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/test/controllers/controller_assertion_mock.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/test/controllers/dispatch_controller.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/test/controllers/spec_helper_controller.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/test/multipart_request_helper_spec.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/test/multipart_upload_text_file.txt</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/test/request_helper_spec.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/test/route_helper_spec.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/test/route_matchers_spec.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/test/view_helper_spec.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/public/test/view_matchers_spec.rb</filename>
    </added>
    <added>
      <filename>framework/merb-core/spec/spec_helper.rb</filename>
    </added>
    <added>
      <filename>script/frozen-merb</filename>
    </added>
  </added>
  <modified type="array"/>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>2ddd0a07dc784b2115b2005294cf2a119314c855</id>
    </parent>
  </parents>
  <author>
    <name>Kyle Neath</name>
    <email>kneath@gmail.com</email>
  </author>
  <url>http://github.com/kneath/greed/commit/1e08d96692e1795437f85cb6b28f440f211f20f6</url>
  <id>1e08d96692e1795437f85cb6b28f440f211f20f6</id>
  <committed-date>2008-04-22T17:00:11-07:00</committed-date>
  <authored-date>2008-04-22T16:57:26-07:00</authored-date>
  <message>Freeze merb</message>
  <tree>b6088853de345bffcd3d24f5417e94b238b3a88a</tree>
  <committer>
    <name>Kyle Neath</name>
    <email>kneath@gmail.com</email>
  </committer>
</commit>
