Merge branch 'maint'
commit86da9dec0af55d8212b37337911cd93214b8f00f
authorJunio C Hamano <junkio@cox.net>
Wed, 18 Apr 2007 00:50:21 +0000 (17 17:50 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 18 Apr 2007 00:50:21 +0000 (17 17:50 -0700)
treefd541a6717d699dc31f4af2d81f3ae25af665fdf
parentc182ec90d824168cfb70494bb920c0a2fb590d98
parentab6029415b7e8acbc1beff7363c74bb94c3f0d9d
Merge branch 'maint'

* maint:
  Start preparing for 1.5.1.2
  git-svn: quiet some warnings when run only with --version/--help
  git-svn: respect lower bound of -r/--revision when following parent

Conflicts:

RelNotes