7988607 Merge branch 'master' into WIP

Merged and Committed by Timothy St. Clair 9 years ago
    Merge branch 'master' into WIP
    
    Conflicts:
    	zookeeper.spec
    
        
file modified
+6 -0