git clone git://github.com/wycats/merb-core.git
change dependency() to use gem() instead of Gem.activate
Merge branch 'master' of git@github.com:wycats/merb-core
As a last resort, look for */* in the formats before throwing NotAcceptable (TODO: Clean this up)
really remove hooks
don't require hook.rb
Fix perform_content_negotiation to correctly handle :format in params. Fix render_* to correctly return the correct content_type.
remove hooks.rb, they were premature and only used in one place
fix evented mongrel to not go crazy
Calling /foo.pdf should throw a 406 if :pdf is not a registered mime.
touch up dispatcher a bit, remove some un-needed code from the hot path
fix dispatcher to not parse the params twice, still supports request_params
Should resolve #180 (Exception in exception.html.erb)
fix some specs to not rebuild the router every iteration
Test documentation
Resolves #181 (Special chars in static filenames)
Install gem with --local so it won't poll remote servers for updates during install
cleaned up a confusing if statement
moved rspec rake tasks into core. Added Merb.rakefiles, which is now used by Merb::Plugins.rakefiles. Changed Kernel#use_test to only load dependency arguments when Merb.env is nil or test.
do not load test framework unless Merb.env == 'test'
Use new Object.make_module to create the module instead of old hackish solution.
Don't clear our mimes previously defined.
Fixed clean task deleting everything in the lib folder
Kernel#dependency requires gems/files in a before_app_loads block.
Move dependency loading after framework and look for framework.rb
remove vestigal rbx dir
Touching up a few things
