2ee04dc Merge branch 'master' into el6

Merged and Committed by orion 10 years ago
    Merge branch 'master' into el6
    
        
file modified
+12 -6
file modified
+1 -1