Konstantin Haase ee2e348f5d Merge branch 'drop-1.8.6' ... Conflicts: Gemfile README.rdoc		2011-03-19 10:15:58 +01:00
..
sinatra	Merge branch 'drop-1.8.6'	2011-03-19 10:15:58 +01:00
sinatra.rb	Deprecate use_in_file_templates!	2009-12-23 04:40:43 +01:00