82633ab Merge branch 'master' into el6

Merged and Committed by stevetraylen 13 years ago
    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	bcprov-jdk16-1.43.pom
    	bcprov-jdk16-1.45.pom
    	bcprov-jdk16-1.46.pom
    	bouncycastle.spec
    	sources
    
        
file modified
+2 -1
bcprov-jdk16-1.46.pom bcprov-jdk16-1.45.pom
file renamed
+1 -1
file modified
+9 -30
file modified
+1 -1