0934137 Merge branch 'f17' of ssh://pkgs.fedoraproject.org/389-ds-base into f17

Merged and Committed by mreynolds 8 years ago
    Merge branch 'f17' of ssh://pkgs.fedoraproject.org/389-ds-base into f17
    
    Conflicts:
    	.gitignore
    	389-ds-base-git-local.sh
    	389-ds-base-git.sh
    	389-ds-base.spec
    	sources
    
        
file modified
+1 -0
file modified
+1 -2
file modified
+4 -0