Merge branch 'rs/maint-estimate-cache-size' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 27 Oct 2011 19:03:16 +0000 (12:03 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 27 Oct 2011 19:03:16 +0000 (12:03 -0700)
commita76a326b2af925ab45d2cfffbb6d925763eb6e5d
treedc7edc297a107f6dcbdc85957a4108750f8a954a
parent8debf696380cad2283b4cfaea78962b8d5923149
parent8f41c07f90da5e314cbc428f1e3e936563f7f39d
Merge branch 'rs/maint-estimate-cache-size' into maint

* rs/maint-estimate-cache-size:
  read-cache.c: fix index memory allocation