0d0d86f Merge branch 'f12/master' of ssh://pkgs.fedoraproject.org/jna into f12

Merged and Committed by lfarkas 13 years ago
1 file changed. 3 lines added. 0 lines removed.
    Merge branch 'f12/master' of ssh://pkgs.fedoraproject.org/jna into f12
    
    Conflicts:
    	jna.spec
    
        
file modified
+3 -0