Merge branch 'master' of git://github.com/bsag/tracks

Conflicts:
	config/locales/de.yml
	config/locales/en.yml

config/database.yml.tmpl

@@ -1,6 +1,9 @@
 development:
   adapter: mysql
   database: tracks
+  # set this if you are storing utf8 in your mysql database to handle strings
+  # like "Réné".Not needed for sqlite. For PostgreSQL use encoding: unicode
+  # encoding: utf8
   host: localhost
   username: root
   password: 
@@ -12,6 +15,9 @@ test: &TEST
 production:
   adapter: mysql
   database: tracks
+  # set this if you are storing utf8 in your mysql database to handle strings
+  # like "Réné".Not needed for sqlite. For PostgreSQL use encoding: unicode
+  # encoding: utf8
   host: localhost
   username: root
   password: 

vendor/rails/railties/lib/rails/gem_dependency.rb

@@ -83,7 +83,7 @@ module Rails
       specification.dependencies.reject do |dependency|
         dependency.type == :development
       end.map do |dependency|
-        GemDependency.new(dependency.name, :requirement => dependency.version_requirements)
+        GemDependency.new(dependency.name, :requirement => (dependency.respond_to?(:requirement) ? dependency.requirement : dependency.version_requirements))
       end
     end
 
@@ -115,9 +115,16 @@ module Rails
       @spec = s
     end
 
-    def requirement
+    if method_defined?(:requirement)
-      r = version_requirements
+      def requirement
-      (r == Gem::Requirement.default) ? nil : r
+        req = super
+        req unless req == Gem::Requirement.default
+      end
+    else
+      def requirement
+        req = version_requirements
+        req unless req == Gem::Requirement.default
+      end
     end
 
     def built?