d682089 Merge branch 'master' into f17

Merged and Committed by jreznik 11 years ago
    Merge branch 'master' into f17
    
        
file modified
+8 -1