7e935f3 Import a newer 1.2 git snapshot

Authored and Committed by lkundrak 8 years ago
    Import a newer 1.2 git snapshot
    
        
file modified
+4 -9
file modified
+1 -1