6e594ce Merge branch 'master' into el6

Merged and Committed by verdurin 13 years ago
    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	BEDTools.spec
    	sources
    
        
file modified
+2 -0
file modified
+10 -5
file modified
+2 -2