Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Fri, 20 Aug 2010 19:55:41 +0000 (12:55 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 20 Aug 2010 19:55:41 +0000 (12:55 -0700)
commitf9c33605700e37b75279ed6ce4bffaad3eb0cf10
tree7c6b37102801db71543fb228c129eb4ff9d5777c
parent09a0ec58ce57413dcb2b2cfb4b4ece11ad616e7b
parent55c6e6dc38188d27b4ec0315db93d6c40725cdd6
Merge branch 'maint'

* maint:
  xmalloc: include size in the failure message