Merge upstream/development

Signed-off-by: Carlos Martín Nieto <cmn@elego.de>

diff --cc include/git2.h
Simple merge

diff --cc include/git2/common.h
index ec338db4e1e03c3048199530c4e01240b692bb91,e0c6bc542e206c0ce77716f704547de533185a1c..7cb98b8243e520f051c96f6478f6b87923e77b7a
--- 1/include/git2/common.h
--- 2/include/git2/common.h
+++ b/include/git2/common.h
@@@ -115,10 -116,10 +116,10 @@@
  /** The specified repository is invalid */
  #define GIT_ENOTAREPO (GIT_ERROR - 7)
  
 -/** The object type is invalid or doesn't match */
 +/** The object or config variable type is invalid or doesn't match */
  #define GIT_EINVALIDTYPE (GIT_ERROR - 8)
  
- /** The object cannot be written that because it's missing internal data */
+ /** The object cannot be written because it's missing internal data */
  #define GIT_EMISSINGOBJDATA (GIT_ERROR - 9)
  
  /** The packfile for the ODB is corrupted */

diff --cc include/git2/types.h
index aa53909d2e43e1f72ac264b2181c34f80ac17b97,88f6b7d55f87ec9018fc28ac2e7732225ea757f8..cb5adcc00ba8d6560936078152b2b8f9d25816dd
--- 1/include/git2/types.h
--- 2/include/git2/types.h
+++ b/include/git2/types.h
@@@ -122,15 -127,9 +127,15 @@@ typedef struct git_tree git_tree
  /** Memory representation of an index file. */
  typedef struct git_index git_index;
  
 +/** Memory representation of a config file */
 +typedef struct git_config git_config;
 +
 +/** Memory representation of a config variable */
 +typedef struct git_cvar git_cvar;
 +
  /** Time in a signature */
  typedef struct git_time {
-       time_t time; /** time in seconds from epoch */
+       git_time_t time; /** time in seconds from epoch */
        int offset; /** timezone offset, in minutes */
  } git_time;
  

diff --cc src/errors.c
Simple merge