7f7017 Merge remote branch 'origin/master' into el6

Merged and Committed by robert 8 years ago
    Merge remote branch 'origin/master' into el6
    
    Conflicts:
    	.gitignore
    
        
file modified
+1 -1
file removed
-20
file modified
+12 -8
file modified
+1 -1