From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 4 Sep 2013 19:28:15 +0000 (-0700)
Subject: Merge branch 'da/darwin'
X-Git-Tag: v1.8.5-rc0~192
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a7eaad65ff5f6bf5c7fda427bcc2b94f6ada598;p=thirdparty%2Fgit.git

Merge branch 'da/darwin'

* da/darwin:
  OS X: Fix redeclaration of die warning
  Makefile: Fix APPLE_COMMON_CRYPTO with BLK_SHA1
  imap-send: use Apple's Security framework for base64 encoding
---

9a7eaad65ff5f6bf5c7fda427bcc2b94f6ada598