0668632 rebase to mock-1.2.8

Authored and Committed by msuchy 9 years ago
    rebase to mock-1.2.8
    
        
file modified
+1 -0
file modified
+58 -100
file modified
+1 -1