d9d4457 Merge branch 'master' into el6

Merged and Committed by filiperosset 13 years ago
    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    
        
file modified
+1 -0
empty file added
file modified
+7 -4
file modified
+1 -1