c7abd41 Merge branch 'master' into f21

Merged and Committed by kenjiro 9 years ago
    Merge branch 'master' into f21
    
    Conflicts:
    	the_silver_searcher.spec
    
        
file modified
+1 -0
file modified
+1 -1
file modified
+8 -9