60041a7 Merge branch 'remove-plexus-container-default'

Merged and Committed by mizdebsk 11 years ago
    Merge branch 'remove-plexus-container-default'
    
    Conflicts:
    	plexus-cipher.spec
    
        
file modified
+4 -2