Merge branch 'master' into next
commit1378e4cdd8240fdd9609b3f26eab2e70a1c40cc5
authorJunio C Hamano <gitster@pobox.com>
Tue, 29 Jun 2010 00:54:38 +0000 (28 17:54 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 29 Jun 2010 00:54:38 +0000 (28 17:54 -0700)
tree2a548c59fbf8b991dfd2336396d60a218b5f58ac
parent3336145a668a798c0dd3f7363f53ae788d35dcc9
parent1ba5c532e1f6ede63fd46bf6b647e70baa10a364
Merge branch 'master' into next

* master:
  Update draft release notes to 1.7.1.1
  notes: Initialise variable to appease gcc
  notes: check number of parameters to "git notes copy"
  msvc: Select the "fast" definition of the {get,put}_be32() macros
notes.c