1d3cb6 Revert "Merge branch 'master' into f17"

Authored and Committed by Simone Caronni 11 years ago
    Revert "Merge branch 'master' into f17"
    
    This reverts commit c55688eba117ef058353a6b3b2b25a35f4676fc0, reversing
    changes made to 4eb05c1a6379f8c9cca9ba6a7824b67f13b68eca.
    
        
file modified
+13 -5