Merge commit 'brynary/master'

Conflicts:

	lib/arel.rb
	lib/arel/session.rb

1 files changed, 5 insertions, 5 deletions

diff --git a/spec/matchers/disambiguate_attributes.rb b/spec/matchers/disambiguate_attributes.rb
index bee7d22b0c..bc4a5215d4 100644
--- a/spec/matchers/disambiguate_attributes.rb
+++ b/spec/matchers/disambiguate_attributes.rb
@@ -3,7 +3,7 @@ module DisambiguateAttributesMatcher
     def initialize(attributes)
       @attributes = attributes
     end
-    
+
     def matches?(actual)
       @actual = actual
       attribute1, attribute2 = @attributes
@@ -11,18 +11,18 @@ module DisambiguateAttributesMatcher
         !@actual[attribute1].descends_from?(attribute2) &&
         @actual[attribute2].descends_from?(attribute2)
     end
-    
+
     def failure_message
       ""
       # "expected #{@actual} to disambiguate its attributes"
     end
-    
+
     def negative_failure_message
       "expected #{@actual} to not disambiguate its attributes"
     end
   end
-  
+
   def disambiguate_attributes(*attributes)
     DisambiguateAttributes.new(attributes)
   end
-end
\ No newline at end of file
+end