Konstantin Haase 5ae2c5f168 Merge branch 'master' of github.com:sinatra/sinatra ... Conflicts: lib/sinatra/base.rb		2012-03-15 09:09:00 +01:00
..
sinatra	Merge branch 'master' of github.com:sinatra/sinatra	2012-03-15 09:09:00 +01:00
sinatra.rb	do not modify load path	2012-01-03 18:00:18 +01:00