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

Junio C Hamano committed Sep 4, 2013 at 12:28 UTC 9a7eaad65ff5f6bf5c7fda427bcc2b94f6ada598

No changes.