Merge branch 'jk/xdiff-memory-limits' into maint-2.3
authorJunio C Hamano <gitster@pobox.com>
Mon, 28 Sep 2015 21:59:28 +0000 (14:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 28 Sep 2015 21:59:28 +0000 (14:59 -0700)
Trivial merge