Merge branch 'gh/userdiff-matlab'

* gh/userdiff-matlab: Add built-in diff patterns for MATLAB code

Junio C Hamano committed Dec 5, 2011 at 15:26 UTC 77230236e38fde817f395efcf66320785cf6f9af

No changes.