Merge branch 'maint-1.6.0' into maint
commit152d70f7287c54135aa93990b462e2d34a39f500
authorJunio C Hamano <gitster@pobox.com>
Wed, 7 Jan 2009 06:12:35 +0000 (6 22:12 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 7 Jan 2009 06:12:35 +0000 (6 22:12 -0800)
tree5d7ffe1e8d738fec9d6eede6a954c358d6e397c3
parent0ddd93b2717d4da074485d42a08e4d3824580afe
parent141201d124f3663a98e0f362c1af7f5f7b58dabb
Merge branch 'maint-1.6.0' into maint

* maint-1.6.0:
  README: tutorial.txt is now called gittutorial.txt