Merge branch 'jk/xdiff-memory-limits' into maint-2.3

Junio C Hamano committed Sep 28, 2015 at 14:59 UTC 92cdfd21313c5bf5657d4ac2d3e6ae7af7e9ce94

No changes.