Sync with maint
commit5bc2dc29d482448f2bdc0e9bbcb6e2d8a89d9c6a
authorJunio C Hamano <gitster@pobox.com>
Fri, 25 May 2012 00:37:40 +0000 (24 17:37 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 25 May 2012 00:37:40 +0000 (24 17:37 -0700)
treeff205041e4b12a10f2106300be7b53135264dc29
parentbd578b507fa79f94009ae1c1a436dc14cf7e6002
parentc4649188e9140c960cec54798b153382fb4d6191
Sync with maint

By Jeff King (1) and Junio C Hamano (1)
* maint:
  Update draft release notes to 1.7.10.3
  osxkeychain: pull make config from top-level directory