d1cdddb Merge branch 'master' of ssh://pkgs.fedoraproject.org/pdfposter

Merged and Committed by fab 12 years ago
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/pdfposter
    
    Conflicts:
    	pdfposter.spec
    
        
file modified
+4 -1