Sync with v1.8.1.4

diff --cc Documentation/git.txt
Simple merge

diff --cc imap-send.c
index 21dc20b57d392c5789043968d28a3b958b2b50c7,ef500111ec0bca6514e519d39e7a269a7342cddf..43ac4e0bdfdba8850eff176b53d6bd071e8f424c
--- 1/imap-send.c
--- 2/imap-send.c
+++ b/imap-send.c
@@@ -31,8 -31,50 +31,9 @@@ typedef void *SSL
  #else
  #include <openssl/evp.h>
  #include <openssl/hmac.h>
+ #include <openssl/x509v3.h>
  #endif
  
 -struct store_conf {
 -      char *name;
 -      const char *path; /* should this be here? its interpretation is driver-specific */
 -      char *map_inbox;
 -      char *trash;
 -      unsigned max_size; /* off_t is overkill */
 -      unsigned trash_remote_new:1, trash_only_new:1;
 -};
 -
 -/* For message->status */
 -#define M_RECENT       (1<<0) /* unsyncable flag; maildir_* depend on this being 1<<0 */
 -#define M_DEAD         (1<<1) /* expunged */
 -#define M_FLAGS        (1<<2) /* flags fetched */
 -
 -struct message {
 -      struct message *next;
 -      size_t size; /* zero implies "not fetched" */
 -      int uid;
 -      unsigned char flags, status;
 -};
 -
 -struct store {
 -      struct store_conf *conf; /* foreign */
 -
 -      /* currently open mailbox */
 -      const char *name; /* foreign! maybe preset? */
 -      char *path; /* own */
 -      struct message *msgs; /* own */
 -      int uidvalidity;
 -      unsigned char opts; /* maybe preset? */
 -      /* note that the following do _not_ reflect stats from msgs, but mailbox totals */
 -      int count; /* # of messages */
 -      int recent; /* # of recent messages - don't trust this beyond the initial read */
 -};
 -
 -struct msg_data {
 -      char *data;
 -      int len;
 -      unsigned char flags;
 -};
 -
  static const char imap_send_usage[] = "git imap-send < <mbox>";
  
  #undef DRV_OK