Merge commit 'mainstream/master'

Conflicts:

	activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
	activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb

2 files changed, 4 insertions, 4 deletions

diff --git a/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb b/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
index 6675041895..bbc290f721 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
@@ -122,7 +122,7 @@ module ActiveRecord
       def retrieve_connection
         connection_handler.retrieve_connection(self)
       end
-      
+
       # Returns true if +ActiveRecord+ is connected.
       def connected?
         connection_handler.connected?(self)
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
index ab3c6d843c..fe9cbcf024 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
@@ -31,12 +31,12 @@ module ActiveRecord
 
         @primary = nil
       end
-      
+
       # Returns +true+ if the column is either of type string or text.
       def text?
         type == :string || type == :text
       end
-      
+
       # Returns +true+ if the column is either of type integer, float or decimal.
       def number?
         type == :integer || type == :float || type == :decimal
@@ -297,7 +297,7 @@ module ActiveRecord
     #         puts t.class  # => "ActiveRecord::ConnectionAdapters::TableDefinition"
     #       end
     #     end
-    #     
+    #
     #     def self.down
     #       ...
     #     end