d160fde Merge branch 'master' into f23

Merged and Committed by Alejandro Alvarez Ayllon 8 years ago
    Merge branch 'master' into f23
    
    Conflicts:
    	.gitignore
    
        
file modified
+2 -0
file modified
+2 -0