9326f46 Merge branch 'f22' into f23

Merged and Committed by jpopelka 8 years ago
    Merge branch 'f22' into f23
    
        
file modified
+1 -0
hplip-3.15.7.tar.gz.asc hplip-3.15.6.tar.gz.asc
file renamed
+3 -3
file modified
+5 -2
file modified
+1 -1