b1a5f1e Fix interfaces merge issues

Authored and Committed by mgrepl 11 years ago
    Fix interfaces merge issues
    
        
file modified
+1 -1
file modified
+0 -19
file modified
+1 -0