ebd475a Merge remote-tracking branch 'origin/master' into el6

Merged and Committed by bonzini 11 years ago
    Merge remote-tracking branch 'origin/master' into el6
    
    Conflicts:
    	recoll.spec
    
        
file modified
+5 -0
file modified
+34 -5
file modified
+1 -1