Merge branch 'maint-1.6.0' into maint-1.6.1
commitcc137194519a8ddbc0514da088fb012bea40df51
authorJunio C Hamano <gitster@pobox.com>
Sat, 25 Apr 2009 05:49:34 +0000 (24 22:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 25 Apr 2009 05:49:34 +0000 (24 22:49 -0700)
treeb05c712c2688adb3009e01d64d2877323f59f113
parenta4d1797332bca95635168032c90765a41eacdc7a
parentc2318228ab327999520b2e5dbc9edbd619a73105
Merge branch 'maint-1.6.0' into maint-1.6.1

* maint-1.6.0:
  test-genrandom: Add newline to usage string