9de436f Merge branch 'master' into f20

Merged and Committed by Vincent Batts 9 years ago
    Merge branch 'master' into f20
    
    Conflicts:
    	.gitignore
    
        
file modified
+1 -0
file modified
+4 -7
file modified
+1 -1