Commit fe965028885fbd8c62dce08e3a86cd3cb3e3b320

Edward Thomson 2015-10-05T23:37:22

Merge pull request #3452 from ethomson/0.23_xdiff 0.23 xdiff