8073f78 Merge branch 'master' of ssh://pkgs.fedoraproject.org/pdfshuffler

Merged and Committed by fab 10 years ago
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/pdfshuffler
    
    Conflicts:
    	pdfshuffler.spec
    
        
file modified
+6 -0