520cec - Update to upstream

Authored and Committed by dwalsh 10 years ago
    - Update to upstream
    Fix incorrect conversion in discover_class code.
    
        
file modified
+9186 -1798
file modified
+28 -3
file modified
+1 -1