Merge branch 'master' into next
commit7fd54b982643bf1a70e2fe5c47a2ce6e42a209b1
authorJunio C Hamano <gitster@pobox.com>
Sun, 24 Apr 2011 06:37:13 +0000 (23 23:37 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 24 Apr 2011 06:37:13 +0000 (23 23:37 -0700)
tree0e3f689070870432695bf69064d3b6d1207b7f61
parentd1ff91a5940de90858a7ef56b8f97e3ace7e7030
parentec014eac0e9e6f30cbbca616090fa2ecf74797e7
Merge branch 'master' into next

* master:
  Git 1.7.5