2fb390c Merge branch 'master' into f20

Merged and Committed by rdieter 9 years ago
    Merge branch 'master' into f20
    
        
file modified
+0 -23
file modified
+15 -6