Merge branch 'maint'
commit1ba5c532e1f6ede63fd46bf6b647e70baa10a364
authorJunio C Hamano <gitster@pobox.com>
Tue, 29 Jun 2010 00:42:26 +0000 (28 17:42 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 29 Jun 2010 00:42:26 +0000 (28 17:42 -0700)
tree5b514b2936389e2f0433565881c8555fe189c644
parent078e9bce1e8e2484d33d7400ae02c10954fd93ac
parentedac1883dc5fbadbc2d7d7cf975ed347eaef0702
Merge branch 'maint'

* maint:
  Update draft release notes to 1.7.1.1
  notes: Initialise variable to appease gcc
  notes: check number of parameters to "git notes copy"
builtin/notes.c
notes.c