5bb4470 Merge branch 'master' of ssh://pkgs.fedoraproject.org/parallel

Merged and Committed by golfu 12 years ago
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/parallel
    
    Conflicts:
    	parallel.spec
    
        
file modified
+2 -0