826a09a Fix FTBFS against Rails 4.1

Authored and Committed by Dominic Cleal 9 years ago
    Fix FTBFS against Rails 4.1
    
    Add d86f6e6, a33ffc7 patches from upstream
    
    Resolves RHBZ#1107234
    
        
file modified
+8 -1