9f9f7a0 Merge branch 'master' into f20

Merged and Committed by Rex Dieter 10 years ago
    Merge branch 'master' into f20
    
        
file modified
+6 -0
0001-fix-KeyError-exception-rollback-as-it-was-before-T.C.patch 0001-cmake_utils-fix-SyntaxError-on-Python-2.patch
file renamed
+12 -15
file modified
+42 -6
file modified
+1 -1