Merge branch 'maint'
commitb10b9184afc9e62140d307dcf2f5d7e625f78c79
authorJunio C Hamano <gitster@pobox.com>
Sat, 30 Jan 2010 07:36:17 +0000 (29 23:36 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 30 Jan 2010 07:36:17 +0000 (29 23:36 -0800)
tree2fd5fc724b38040a9fe198d19e815f2a7080e380
parent947c3464e49522c55296a8191aed7946bd0f4308
parent3325cea0f7ef7355f6806b2fc88acdb2e27785ac
Merge branch 'maint'

* maint:
  fix memcpy of overlapping area