Merge pull request #669 from gollum/sinatra1.4

Upgrade to sinatra 1.4

gollum.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
 
   s.name              = 'gollum'
   s.version           = '2.4.11'
-  s.date              = '2013-03-21'
+  s.date              = '2013-03-22'
   s.rubyforge_project = 'gollum'
 
   s.summary     = "A simple, Git-powered wiki."
@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = %w[README.md LICENSE]
 
   s.add_dependency('gollum-lib', '~> 0.0.1')
-  s.add_dependency('sinatra', '~> 1.3.5')
+  s.add_dependency('sinatra', '~> 1.4.0')
   s.add_dependency('mustache', ['>= 0.99.4', '< 1.0.0'])
   s.add_dependency('useragent', '~> 0.4.16')
   s.add_dependency('stringex', '~> 1.5.1')